[vdr-plugin-satip] 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 annotated tag debian/2.2.0-2
in repository vdr-plugin-satip.

commit 3b5c9fb50f0a99a4377065779eb2ec45215d6391
Author: etobi <git at e-tobi.net>
Date:   Mon Mar 23 23:14:04 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 545172f..77d9331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-satip (2.2.0-2) experimental; urgency=medium
+
+  * Now supporting the /etc/vdr/conf.d mechanism
+
+ -- Tobias Grimm <etobi at debian.org>  Mon, 23 Mar 2015 23:14:01 +0100
+
 vdr-plugin-satip (2.2.0-1) experimental; urgency=medium
 
   * Added debian/watch
diff --git a/debian/install b/debian/install
index a6d19da..2844636 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-debian/plugin.satip.conf    etc/vdr/plugins/
+debian/satip.conf    etc/vdr/conf.avail/
diff --git a/debian/rules b/debian/rules
index cfa5f19..5f7c07c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 
 MAKE_OPTIONS = STRIP=/bin/true
 
-.PHONY: override_dh_auto_build override_dh_strip override_dh_auto_install override_dh_gencontrol
+.PHONY: override_dh_auto_build override_dh_strip override_dh_auto_install
 
 override_dh_auto_build:
 	dh_auto_build -- $(MAKE_OPTIONS)
@@ -15,10 +15,6 @@ override_dh_strip:
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/vdr-plugin-satip
 
-override_dh_gencontrol:
-	sh /usr/share/vdr-dev/dependencies.sh
-	dh_gencontrol
-
 %:
-	dh $@
+	dh $@ --with vdrplugin
 
diff --git a/debian/plugin.satip.conf b/debian/satip.conf
similarity index 98%
rename from debian/plugin.satip.conf
rename to debian/satip.conf
index 78aabd4..bb8a000 100644
--- a/debian/plugin.satip.conf
+++ b/debian/satip.conf
@@ -5,6 +5,9 @@
 #   - /usr/share/doc/vdr-plugin-satip/README.gz
 #   - vdr -Psatip --help
 #
+
+[satip]
+
 #  -d <num>, --devices=<number>  set number of devices to be created
 #  -t <mode>, --trace=<mode>     set the tracing mode
 #  -s <ipaddr>|<model>|<desc>, --server=<ipaddr1>|<model1>|<desc1>;<ipaddr2>|<model2>|<desc2>

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