r6439 - in /vdr/vdr/trunk/debian: changelog vdr.postinst

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Sun Mar  2 07:29:29 2008
New Revision: 6439

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6439
Log:
* Removed upgrade code for VDR 1.2.6 from postinst

Modified:
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/vdr.postinst

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=6439&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Sun Mar  2 07:29:29 2008
@@ -37,6 +37,7 @@
     requires the plugin directory!
   * Added short description to the NAME section of the manpages to fix the
     Lintian manpage-has-bad-whatis-entry warning
+  * Removed upgrade code for VDR 1.2.6 from postinst
 
   [ Thomas Günther ]
   * Adapted 04_newplugin.dpatch

Modified: vdr/vdr/trunk/debian/vdr.postinst
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/vdr.postinst?rev=6439&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/vdr.postinst (original)
+++ vdr/vdr/trunk/debian/vdr.postinst Sun Mar  2 07:29:29 2008
@@ -30,31 +30,7 @@
     configure)
         
         . /usr/share/debconf/confmodule
-        
-        # Try to stop vdr a second time when we are upgrading
-        # from a version smaller 1.2.6-9, because the init-script
-        # of the old version can not stop vdr without a existing
-        # /usr/bin/vdr
-        if [ ! -z $2 ]; then
-           if `dpkg --compare-versions $2 lt 1.2.6-9`; then
-              if [ -x "/etc/init.d/vdr" ]; then
-                 if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                    invoke-rc.d vdr stop
-                 else
-                    /etc/init.d/vdr stop
-                 fi
-              fi
-           fi
-        fi
-        
-        # move cfg-files from /etc/vdr to /var/lib/vdr
-        for FILE in remote.conf setup.conf timers.conf; do
-                if [ -e /etc/vdr/$FILE ] && [ ! -e /var/lib/vdr/$FILE ]; then
-                        printf "Note: Moving /etc/vdr/$FILE to /var/lib/vdr/$FILE\n"
-                        mv /etc/vdr/$FILE /var/lib/vdr/$FILE
-                fi
-        done
-        
+    
         # install/move channels.conf 
         if [ ! -e /var/lib/vdr/channels.conf ]; then
                 if  [ -e /etc/vdr/channels.conf ]; then