[SCM] vdr packaging repository branch, master, updated. vdr-1.7.16-355-g288473b

[etobi]

The following commit has been merged in the master branch:
commit 288473bb29361959a9a044c361d0d6e413cd1b8f
Author: etobi <git at e-tobi.net>
Date:   Sat Jan 1 16:34:36 2011 +0100

    Dropped moving of channels.conf from /etc/vdr/ to /var/lib/vdr/

diff --git a/debian/changelog b/debian/changelog
index 6f09e0b..bb7cd4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ vdr (1.7.16-1) UNRELEASED; urgency=low
   * Removed vdr-kbd, vdr-daemon, vdr-lirc and vdr-rcu - /usr/bin/vdr should be
     used instead
   * Dropped conflicts to vdradmin
+  * Dropped moving of channels.conf from /etc/vdr/ to /var/lib/vdr/
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 01 Jan 2011 16:20:54 +0100
 
diff --git a/debian/vdr.postinst b/debian/vdr.postinst
index db8c4f3..db73146 100644
--- a/debian/vdr.postinst
+++ b/debian/vdr.postinst
@@ -33,30 +33,25 @@ case "$1" in
 
         # install/move channels.conf 
         if [ ! -e /var/lib/vdr/channels.conf ]; then
-                if  [ -e /etc/vdr/channels.conf ]; then
-                        printf "Note: Moving /etc/vdr/channels.conf to /var/lib/vdr/channels.conf\n"
-                        mv /etc/vdr/channels.conf /var/lib/vdr/channels.conf
-                else
-                        db_get vdr/select_dvb_card
-
-                        case "$RET" in
-                        Satellite)
-                                gzip -dc /usr/share/doc/vdr/examples/channels.conf.gz \
-                                > /var/lib/vdr/channels.conf
-                                chmod 644 /var/lib/vdr/channels.conf
-                        ;;
-                        Terrestrial)
-                                gzip -dc /usr/share/doc/vdr/examples/channels.conf.terr.gz \
-                                > /var/lib/vdr/channels.conf
-                                chmod 644 /var/lib/vdr/channels.conf
-                        ;;
-                        Cable)
-                                gzip -dc /usr/share/doc/vdr/examples/channels.conf.cable.gz \
-                                > /var/lib/vdr/channels.conf
-                                chmod 644 /var/lib/vdr/channels.conf
-                        ;;
-                        esac
-                fi
+                db_get vdr/select_dvb_card
+
+                case "$RET" in
+                Satellite)
+                        gzip -dc /usr/share/doc/vdr/examples/channels.conf.gz \
+                        > /var/lib/vdr/channels.conf
+                        chmod 644 /var/lib/vdr/channels.conf
+                ;;
+                Terrestrial)
+                        gzip -dc /usr/share/doc/vdr/examples/channels.conf.terr.gz \
+                        > /var/lib/vdr/channels.conf
+                        chmod 644 /var/lib/vdr/channels.conf
+                ;;
+                Cable)
+                        gzip -dc /usr/share/doc/vdr/examples/channels.conf.cable.gz \
+                        > /var/lib/vdr/channels.conf
+                        chmod 644 /var/lib/vdr/channels.conf
+                ;;
+                esac
         fi
 
         db_get vdr/create_video_dir
@@ -144,7 +139,7 @@ db_stop
 
 # FIXME
 # wait for vdr to properly shutdown before it is restarted again
-sleep 5 
+sleep 5
 
 
 #DEBHELPER#

-- 
vdr packaging repository