[vdr] 01/01: Install channels.conf.sat as default channels.conf file

[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_etobi4
in repository vdr.

commit c086a1258162ad069e8d50d0c0b2d25108180ccb
Author: etobi <git at e-tobi.net>
Date:   Thu Mar 12 16:25:16 2015 +0100

    Install channels.conf.sat as default channels.conf file
    
    * Install channels.conf.sat as default channels.conf file
    * Dropped the default video directory link
---
 debian/changelog    | 7 +++++++
 debian/vdr.links    | 2 --
 debian/vdr.postinst | 5 ++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1dbad92..2091e72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vdr (2.2.0-1~etobi4) unstable; urgency=medium
+
+  * Install channels.conf.sat as default channels.conf file
+  * Dropped the default video directory link
+
+ -- Tobias Grimm <etobi at debian.org>  Thu, 12 Mar 2015 16:09:09 +0100
+
 vdr (2.2.0-1~etobi3) unstable; urgency=medium
 
   * When LIRC is set to an empty string, disable LIRC. By default use
diff --git a/debian/vdr.links b/debian/vdr.links
index 3a4aa42..bed10b3 100644
--- a/debian/vdr.links
+++ b/debian/vdr.links
@@ -13,8 +13,6 @@ etc/vdr/scr.conf         var/lib/vdr/scr.conf
 etc/vdr/sources.conf     var/lib/vdr/sources.conf
 etc/vdr/svdrphosts.conf  var/lib/vdr/svdrphosts.conf
 
-var/lib/video.00  var/lib/video
-
 var/lib/vdr/setup.conf       etc/vdr/setup.conf
 var/lib/vdr/remote.conf      etc/vdr/remote.conf
 var/lib/vdr/channels.conf    etc/vdr/channels.conf
diff --git a/debian/vdr.postinst b/debian/vdr.postinst
index 1c4a75b..65d11da 100644
--- a/debian/vdr.postinst
+++ b/debian/vdr.postinst
@@ -27,10 +27,9 @@ ACTION=$1
 if [ "$ACTION" = "configure" ] ; then
     TryCreateVideoDir
 
-    # copy example channels.conf files into config dir
+    # copy example channels.conf file into config dir
     if [ ! -e /var/lib/vdr/channels.conf ]; then
-        cp /usr/share/doc/vdr/examples/channels.conf* /var/lib/vdr/
-        gunzip /var/lib/vdr/channels.conf*.gz
+        cp /usr/share/doc/vdr/examples/channels.conf-examples/channels.conf.sat /var/lib/vdr/channels.conf
     fi
 
     # ensure that user and group 'vdr' exist

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