[vdr-plugin-live] 01/01: Now supporting the /etc/vdr/conf.d mechanism

[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-plugin-live.

commit b7c5a7b6de5b39c903cb0c753d355cd478f91846
Author: etobi <git at e-tobi.net>
Date:   Mon Mar 23 22:53:39 2015 +0100

    Now supporting the /etc/vdr/conf.d mechanism
---
 debian/changelog                       | 6 ++++++
 debian/install                         | 2 +-
 debian/{plugin.live.conf => live.conf} | 2 ++
 debian/rules                           | 6 +-----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83440b0..e77b349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-live (0.3.0+git20150213-3) unstable; urgency=medium
+
+  * Now supporting the /etc/vdr/conf.d mechanism
+
+ -- Tobias Grimm <etobi at debian.org>  Mon, 23 Mar 2015 22:53:36 +0100
+
 vdr-plugin-live (0.3.0+git20150213-2) unstable; urgency=medium
 
   * Build-depend on vdr-dev (>= 2.2.0)
diff --git a/debian/install b/debian/install
index 76649cd..3331c31 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,2 @@
 live                       usr/share/vdr/plugins/
-debian/plugin.live.conf    etc/vdr/plugins/
+debian/live.conf           etc/vdr/conf.avail/
diff --git a/debian/plugin.live.conf b/debian/live.conf
similarity index 97%
rename from debian/plugin.live.conf
rename to debian/live.conf
index 60912db..679c4e5 100644
--- a/debian/plugin.live.conf
+++ b/debian/live.conf
@@ -5,6 +5,8 @@
 #   - /usr/share/doc/vdr-plugin-live/README
 #   - `vdr --help -Plive`
 
+[live]
+
 --port=8008
 --ip=0.0.0.0
 
diff --git a/debian/rules b/debian/rules
index d461cd6..e824176 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ PLG_PACKAGE = $(filter-out %-dbg, $(shell dh_listpackages))
 DBG_PACKAGE = $(filter %-dbg, $(shell dh_listpackages))
 
 %:
-	dh $@
+	dh $@ --with vdrplugin
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/$(PLG_PACKAGE)
@@ -14,9 +14,5 @@ override_dh_auto_install:
 override_dh_strip:
 	dh_strip --dbg-package=$(DBG_PACKAGE)
 
-override_dh_gencontrol:
-	sh /usr/share/vdr-dev/dependencies.sh
-	dh_gencontrol
-
 get-vcs-snapshot:
 	sh debian/get-vcs-snapshot.sh

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