[vdr-plugin-mp3] 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/0.10.2-22
in repository vdr-plugin-mp3.

commit eea86583c8784b273178b5a55b1e741794b38cfa
Author: etobi <git at e-tobi.net>
Date:   Mon Mar 23 23:01:29 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 2f2d28f..cbaf1be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-mp3 (0.10.2-22) unstable; urgency=medium
+
+  * Now supporting the /etc/vdr/conf.d mechanism
+
+ -- Tobias Grimm <etobi at debian.org>  Mon, 23 Mar 2015 23:01:26 +0100
+
 vdr-plugin-mp3 (0.10.2-21) unstable; urgency=medium
 
   * Added vdr 2.1.x compatibility patch from Lars Hanisch (yaVDR)
diff --git a/debian/plugin.mplayer.conf b/debian/mplayer.conf
similarity index 93%
rename from debian/plugin.mplayer.conf
rename to debian/mplayer.conf
index 8d717a5..df47ed7 100644
--- a/debian/plugin.mplayer.conf
+++ b/debian/mplayer.conf
@@ -3,4 +3,7 @@
 #
 # For details see /usr/share/doc/vdr-plugin-mplayer/README and README.Debian
 #
+
+[mplayer]
+
 --mount /usr/share/vdr-plugin-mplayer/mount
diff --git a/debian/rules b/debian/rules
index 9bbb7e5..5f4cb8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
 CXXFLAGS += $(shell pkg-config vdr --variable=cxxflags) $(LDFLAGS)
 
 %:
-	dh $@
+	dh $@ --with vdrplugin
 
 override_dh_auto_build:
 	dh_auto_build -- all $(MAKE_OPTIONS)
@@ -45,7 +45,3 @@ override_dh_install:
 override_dh_auto_clean:
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -rf locale libvdr-*.so.*
-
-override_dh_gencontrol:
-	sh /usr/share/vdr-dev/dependencies.sh
-	dh_gencontrol
diff --git a/debian/vdr-plugin-mplayer.install b/debian/vdr-plugin-mplayer.install
index 626a292..671f55d 100644
--- a/debian/vdr-plugin-mplayer.install
+++ b/debian/vdr-plugin-mplayer.install
@@ -1,6 +1,6 @@
 libvdr-mplayer.so.*             usr/lib/vdr/plugins/
 
-debian/plugin.mplayer.conf      etc/vdr/plugins/
+debian/mplayer.conf             etc/vdr/conf.avail/
 debian/vdrmplayer.sh.conf       etc/vdr/plugins/
 debian/mplayersources.conf      etc/vdr/plugins/
 

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