[vdr] 03/03: Removed upgrad-code from postinst for old 1.5.x versions

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to annotated tag debian/2.2.0-1_etobi2
in repository vdr.

commit 01bf7383486ca73e6d09ee3e20286ad5f8a512a7
Author: etobi <git at e-tobi.net>
Date:   Sun Feb 22 11:44:11 2015 +0100

    Removed upgrad-code from postinst for old 1.5.x versions
---
 debian/changelog    |  4 ++--
 debian/vdr.postinst | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a18b69..ec63ca0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-vdr (2.2.0-1~etobi2) UNRELEASED; urgency=medium
+vdr (2.2.0-1~etobi2) unstable; urgency=medium
 
   * Dropped upgrade code for pre-Squeeze releases
   * Default video directory is now /var/lib/video because multiple video
     directories are not supported anymore
 
- -- Tobias Grimm <etobi at debian.org>  Sun, 22 Feb 2015 10:52:50 +0100
+ -- Tobias Grimm <etobi at debian.org>  Sun, 22 Feb 2015 11:42:27 +0100
 
 vdr (2.2.0-1~etobi1) unstable; urgency=medium
 
diff --git a/debian/vdr.postinst b/debian/vdr.postinst
index 69a3d53..1c4a75b 100644
--- a/debian/vdr.postinst
+++ b/debian/vdr.postinst
@@ -25,16 +25,6 @@ ACTION=$1
 #
 
 if [ "$ACTION" = "configure" ] ; then
-    # Fix channels.conf when updating from 1.5.14 to 1.5.15
-    if dpkg --compare-versions "$2" ge "1.5.14" ; then
-        if dpkg --compare-versions "$2" lt "1.5.15" ; then
-            if [ -e /var/lib/vdr/channels.conf ]; then
-                cp /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf.1.5.14
-                sed -i 's/M2O0S0//' /var/lib/vdr/channels.conf
-            fi
-        fi
-    fi
-
     TryCreateVideoDir
 
     # copy example channels.conf files into config dir

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git