[SCM] vdr-plugin-live packaging repository branch, master, updated. debian/0.2.0-17-3-g163ff70

[etobi]

The following commit has been merged in the master branch:
commit 8a33b37983822f94e65eb4e0166f94193b2af3b5
Merge: 39d2b5715a88c98c795dbedc6124ada79be3e286 70a5d4fd54c9f44ee6490615107bdebcee7fb41b
Author: etobi <git at e-tobi.net>
Date:   Sat Jan 14 23:12:40 2012 +0100

    Merge commit 'upstream/0.2.0+git20120114'
    
    Conflicts:
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/install
    	debian/plugin.live.conf
    	debian/postinst
    	debian/postrm
    	debian/rules

diff --combined debian/links
index 0000000,a09ac13..cb64dc6
mode 000000,100644..100644
--- a/debian/links
+++ b/debian/links
@@@ -1,0 -1,4 +1,4 @@@
 -usr/share/vdr-plugin-live/css		var/lib/vdr/plugins/live/css
 -usr/share/vdr-plugin-live/img		var/lib/vdr/plugins/live/img
 -usr/share/vdr-plugin-live/js		var/lib/vdr/plugins/live/js
 -usr/share/vdr-plugin-live/themes	var/lib/vdr/plugins/live/themes
++usr/share/vdr-plugin-live/css       var/lib/vdr/plugins/live/css
++usr/share/vdr-plugin-live/img       var/lib/vdr/plugins/live/img
++usr/share/vdr-plugin-live/js        var/lib/vdr/plugins/live/js
++usr/share/vdr-plugin-live/themes    var/lib/vdr/plugins/live/themes
diff --combined debian/postinst
index e4b9fdc,2f989fe..b315623
--- a/debian/postinst
+++ b/debian/postinst
@@@ -21,12 -21,6 +21,6 @@@ set -
  case "$1" in
      configure)
          chown -R vdr:vdr /var/lib/vdr/plugins/live
- 
-         CFGDIR="/var/lib/vdr/plugins/live"
-         for DIR in css img js themes; do
-                 [ ! -L $CFGDIR/$DIR ] && \
-                         ln -s /usr/share/vdr-plugin-live/$DIR $CFGDIR/$DIR
-         done
      ;;
  
      abort-upgrade|abort-remove|abort-deconfigure)
@@@ -44,3 -38,5 +38,3 @@@ esa
  #DEBHELPER#
  
  exit 0
 -
 -

-- 
vdr-plugin-live packaging repository