[vdradmin-am] 01/01: Install sample vdradmind.conf from /usr/share/vdradmin-am instead of /usr/share/doc/vdradmin-am (Closes: #710441)

[Tobias Grimm]

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

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

commit e869fb1f825d4fe033e4b13b52bc227ff935f4fb
Author: etobi <git at e-tobi.net>
Date:   Sun Apr 6 20:31:45 2014 +0200

    Install sample vdradmind.conf from /usr/share/vdradmin-am instead of /usr/share/doc/vdradmin-am (Closes: #710441)
---
 debian/changelog           | 7 +++++++
 debian/examples            | 1 -
 debian/postinst            | 2 +-
 debian/vdradmin-am.install | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9871240..6b3dc29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vdradmin-am (3.6.9-3) unstable; urgency=medium
+
+  * Install sample vdradmind.conf from /usr/share/vdradmin-am instead of
+    /usr/share/doc/vdradmin-am (Closes: #710441)
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 06 Apr 2014 20:29:21 +0200
+
 vdradmin-am (3.6.9-2) unstable; urgency=low
 
   * Added Fixed-LSTR-for-VDR-1.7.21.patch (Closes: #653136)
diff --git a/debian/examples b/debian/examples
index 343e58b..9a0c964 100644
--- a/debian/examples
+++ b/debian/examples
@@ -1,3 +1,2 @@
 contrib/user.css.example
 contrib/vdradmind.bl_example
-debian/vdradmind.conf
diff --git a/debian/postinst b/debian/postinst
index ab93bb2..1fb19b4 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -7,7 +7,7 @@ if [ ! -f /var/lib/vdradmin-am/vdradmind.conf ]; then
   if [ -f /var/lib/vdradmin/vdradmind.conf ]; then
      mv /var/lib/vdradmin/vdradmind.conf /var/lib/vdradmin-am/
   else
-     cp /usr/share/doc/vdradmin-am/examples/vdradmind.conf /var/lib/vdradmin-am/
+     cp /usr/share/vdradmin-am/vdradmind.conf /var/lib/vdradmin-am/
   fi
 fi
 
diff --git a/debian/vdradmin-am.install b/debian/vdradmin-am.install
index e600b01..a1a3e7f 100644
--- a/debian/vdradmin-am.install
+++ b/debian/vdradmin-am.install
@@ -4,3 +4,4 @@ convert.pl                           usr/share/vdradmin-am/
 autotimer2searchtimer.pl             usr/share/vdradmin-am/
 debian/at2epgsearch                  usr/share/vdradmin-am/
 debian/vdradmind                     usr/bin/
+debian/vdradmind.conf                usr/share/vdradmin-am/

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