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

commit 078f8b22fd5a5c35a2f2b2e9722d3aeb645f1d94
Author: etobi <git at e-tobi.net>
Date:   Mon Mar 23 20:11:39 2015 +0100

    Now supporting the /etc/vdr/conf.d mechanism
---
 debian/changelog       | 6 ++++++
 debian/dvd.conf        | 7 +++++++
 debian/install         | 2 +-
 debian/plugin.dvd.conf | 1 -
 debian/rules           | 6 +-----
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0550132..f125a83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-23) unstable; urgency=medium
+
+  * Now supporting the /etc/vdr/conf.d mechanism
+
+ -- Tobias Grimm <etobi at debian.org>  Mon, 23 Mar 2015 20:07:39 +0100
+
 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-22) unstable; urgency=medium
 
   * Build-depend on vdr-dev (>= 2.2.0)
diff --git a/debian/dvd.conf b/debian/dvd.conf
new file mode 100644
index 0000000..3e213eb
--- /dev/null
+++ b/debian/dvd.conf
@@ -0,0 +1,7 @@
+#
+# dvd VDR plugin arguments
+#
+
+[dvd]
+
+-C /var/cache/vdr/dvd
diff --git a/debian/install b/debian/install
index 8676c8d..9b672c9 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
 libvdr-dvd.so.*                 usr/lib/vdr/plugins/
-debian/plugin.dvd.conf          etc/vdr/plugins/
+debian/dvd.conf                 etc/vdr/conf.avail/
 debian/vdr-plugin-dvd.groups    usr/share/vdr/groups.d/
 locale                          usr/share/
diff --git a/debian/plugin.dvd.conf b/debian/plugin.dvd.conf
deleted file mode 100644
index dfbda14..0000000
--- a/debian/plugin.dvd.conf
+++ /dev/null
@@ -1 +0,0 @@
--C /var/cache/vdr/dvd
diff --git a/debian/rules b/debian/rules
index 6727290..408e1fc 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)
 
 %:
-	dh $@
+	dh $@ --with vdrplugin
 
 override_dh_auto_build:
 	dh_auto_build -- all $(MAKE_OPTIONS)
@@ -16,9 +16,5 @@ 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
-
 get-vcs-snapshot:
 	ruby debian/get-vcs-snapshot.rb

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