[vdr-plugin-xineliboutput] 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-xineliboutput.

commit 3615b01a5708ba11a2c66b4f0cc28372d358125b
Author: etobi <git at e-tobi.net>
Date:   Mon Mar 23 23:30:17 2015 +0100

    Now supporting the /etc/vdr/conf.d mechanism
---
 debian/changelog                        |  6 ++++++
 debian/plugin.xineliboutput.conf        | 12 ------------
 debian/rules                            |  3 +--
 debian/vdr-plugin-xineliboutput.install |  4 ++--
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index abd4047..86b11e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-xineliboutput (1.1.0+cvs20150211-4) unstable; urgency=medium
+
+  * Now supporting the /etc/vdr/conf.d mechanism
+
+ -- Tobias Grimm <etobi at debian.org>  Mon, 23 Mar 2015 23:30:11 +0100
+
 vdr-plugin-xineliboutput (1.1.0+cvs20150211-3) unstable; urgency=medium
 
   * Build-depend on vdr-dev (>= 2.2.0)
diff --git a/debian/plugin.xineliboutput.conf b/debian/plugin.xineliboutput.conf
deleted file mode 100644
index c79e64f..0000000
--- a/debian/plugin.xineliboutput.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Command line parameters for vdr-plugin-xineliboutput
-#
-# For more details see:
-#   - /usr/share/doc/vdr-plugin-xineliboutput/README.Debian
-#   - `vdr --help -Pxineliboutput`
-#   - /usr/share/doc/vdr-plugin-xineliboutput/README
-#
-
---local=none
---primary
---remote=127.0.0.1:37890
diff --git a/debian/rules b/debian/rules
index 4deadda..783fe35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh $@ --with vdrplugin
 
 override_dh_auto_configure:
 	./configure
@@ -19,7 +19,6 @@ override_dh_auto_clean:
 	rm -f vdr-sxfe.1 vdr-fbfe.1
 
 override_dh_gencontrol:
-	sh /usr/share/vdr-dev/dependencies.sh
 	dpkg -p libxine2-dev | sed -re '/^Version:/! d; s/^Version: (([0-9]:)?([0-9]+\.){2}[0-9]+).*$$/xine:Depends=libxine2 (>= \1)/' \
 	>> debian/libxine2-xvdr.substvars
 	dh_gencontrol
diff --git a/debian/vdr-plugin-xineliboutput.install b/debian/vdr-plugin-xineliboutput.install
index 033a01d..68b86c6 100644
--- a/debian/vdr-plugin-xineliboutput.install
+++ b/debian/vdr-plugin-xineliboutput.install
@@ -1,4 +1,4 @@
 libvdr-xineliboutput.so.*       usr/lib/vdr/plugins/
-examples/allowed_hosts.conf         etc/vdr/plugins/xineliboutput/
-debian/plugin.xineliboutput.conf    etc/vdr/plugins/
+examples/allowed_hosts.conf     etc/vdr/plugins/xineliboutput/
+debian/xineliboutput.conf       etc/vdr/conf.avail/
 debian/tmp/usr/share/locale

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