[vdr] 08/08: New upstream release

[Tobias Grimm]

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

tiber-guest pushed a commit to branch master
in repository vdr.

commit f68060134becf8d33ed4c2a15234bb6407fc4016
Author: etobi <git at e-tobi.net>
Date:   Wed Sep 4 13:54:14 2013 +0200

    New upstream release
    
    * New upstream release
    * Install sample channels.conf's to /usr/share/vdr/examples/ (Closes: #709749)
---
 debian/changelog    |    7 +++++++
 debian/rules        |    1 +
 debian/vdr.examples |    1 -
 debian/vdr.install  |    3 +++
 debian/vdr.links    |    2 ++
 debian/vdr.postinst |   17 +++++++----------
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23240b9..3fe11cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vdr (2.0.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Install sample channels.conf's to /usr/share/vdr/examples/ (Closes: #709749)
+
+ -- Tobias Grimm <etobi at debian.org>  Wed, 04 Sep 2013 13:53:51 +0200
+
 vdr (2.0.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 70ee660..0df22a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ override_dh_auto_clean:
 
 override_dh_auto_install:
 	dh_auto_install -- $(MAKE_OPTIONS)
+	mv debian/tmp/var/lib/vdr/channels.conf debian/tmp/var/lib/vdr/channels.conf.sat
 
 override_dh_install:
 	dh_install --fail-missing -Xlibvdr-epgtableid0.so
diff --git a/debian/vdr.examples b/debian/vdr.examples
deleted file mode 100644
index 512064f..0000000
--- a/debian/vdr.examples
+++ /dev/null
@@ -1 +0,0 @@
-channels.conf.*
diff --git a/debian/vdr.install b/debian/vdr.install
index c9745be..1863244 100644
--- a/debian/vdr.install
+++ b/debian/vdr.install
@@ -31,3 +31,6 @@ debian/reccmds.custom.conf              etc/vdr/command-hooks/
 debian/commands.update-recordings.conf  usr/share/vdr/command-hooks/
 
 debian/themes/*.theme                   var/lib/vdr/themes/
+
+var/lib/vdr/channels.conf.sat           usr/share/vdr/channels.conf-examples/
+channels.conf.*                         usr/share/vdr/channels.conf-examples/
diff --git a/debian/vdr.links b/debian/vdr.links
index cc0bd53..bed10b3 100644
--- a/debian/vdr.links
+++ b/debian/vdr.links
@@ -19,3 +19,5 @@ var/lib/vdr/channels.conf    etc/vdr/channels.conf
 etc/default/vdr              etc/vdr/vdr.default
 
 etc/vdr/vdr.groups    usr/share/vdr/groups.d/vdr.groups
+
+usr/share/vdr/channels.conf-examples    usr/share/doc/vdr/examples/channels.conf-examples
diff --git a/debian/vdr.postinst b/debian/vdr.postinst
index db73146..761433a 100644
--- a/debian/vdr.postinst
+++ b/debian/vdr.postinst
@@ -31,24 +31,21 @@ case "$1" in
 
         . /usr/share/debconf/confmodule
 
-        # install/move channels.conf 
+        # install/move channels.conf
         if [ ! -e /var/lib/vdr/channels.conf ]; then
                 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
+                        cp /usr/share/vdr/channels.conf-examples/channels.conf.sat /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
+                        cp /usr/share/vdr/channels.conf-examples/channels.conf.terr /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
+                        cp /usr/share/vdr/channels.conf-examples/channels.conf.cable /var/lib/vdr/channels.conf
                         chmod 644 /var/lib/vdr/channels.conf
                 ;;
                 esac
@@ -56,7 +53,7 @@ case "$1" in
 
         db_get vdr/create_video_dir
         if $RET; then
-                # check if an old directory /var/lib/video exists, and 
+                # check if an old directory /var/lib/video exists, and
                 # symlink it to /var/lib/video.00
                 if [ -d /var/lib/video ] && [ ! -e /var/lib/video.00 ]; then
                         ln -s video /var/lib/video.00
@@ -67,7 +64,7 @@ case "$1" in
                         mkdir /var/lib/video.00
                 fi
 
-                # check if /var/lib/video.00 exists and /var/lib/video is 
+                # check if /var/lib/video.00 exists and /var/lib/video is
                 # missing, then create the symlink /var/lib/video which
                 # points to /var/lib/video.00
                 if [ ! -e /var/lib/video ] && [ -e /var/lib/video.00 ]; then
@@ -98,7 +95,7 @@ case "$1" in
 
         # ensure that vdr's config and recording files are correctly owned
         [ -e /var/lib/video ] && chown -R $USER:$GROUP /var/lib/video/
-        if [ -e /var/lib/vdr ] ; then 
+        if [ -e /var/lib/vdr ] ; then
             chown $USER:$GROUP /var/lib/vdr
             chown $USER:$GROUP /var/lib/vdr/* > /dev/null 2>&1 || true
         fi

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