[SCM] vdr-plugin-vnsiserver/master: Build-depend on vdr-dev >= 2.2.0 and use new config.d mechanism

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0ef1187ba83a5a38b7b466e8ea18d58ff03d118d
Author: Tobias Grimm <etobi at debian.org>
Date:   Sat Aug 8 13:50:13 2015 +0200

    Build-depend on vdr-dev >= 2.2.0 and use new config.d mechanism

diff --git a/debian/control b/debian/control
index 06dcfee..70e2af9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: video
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Balint Reczey <balint at balintreczey.hu>, Tobias Grimm <etobi at debian.org>
-Build-Depends: debhelper (>= 9), pkg-config, vdr-dev (>= 1.7.17),
+Build-Depends: debhelper (>= 9), pkg-config, vdr-dev (>= 2.2.0),
 Standards-Version: 3.9.6
 Homepage: https://github.com/FernetMenta/vdr-plugin-vnsiserver
 Vcs-Git: git://git.debian.org/pkg-multimedia/vdr-plugin-vnsiserver.git
diff --git a/debian/plugin.vnsiserver.conf b/debian/plugin.vnsiserver.conf
deleted file mode 100644
index f942799..0000000
--- a/debian/plugin.vnsiserver.conf
+++ /dev/null
@@ -1 +0,0 @@
--t 10
diff --git a/debian/rules b/debian/rules
index 492c87f..40da563 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,14 +10,10 @@ PLG_PACKAGE = $(filter-out %-dbg, $(shell dh_listpackages))
 DBG_PACKAGE = $(filter %-dbg, $(shell dh_listpackages))
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with vdrplugin
 
 override_dh_strip:
 	dh_strip --dbg-package=$(DBG_PACKAGE)
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/$(PLG_PACKAGE)
-
-override_dh_gencontrol:
-	sh /usr/share/vdr-dev/dependencies.sh
-	dh_gencontrol
diff --git a/debian/vdr-plugin-vnsiserver.install b/debian/vdr-plugin-vnsiserver.install
index c8f6c5e..e1572d9 100644
--- a/debian/vdr-plugin-vnsiserver.install
+++ b/debian/vdr-plugin-vnsiserver.install
@@ -1,2 +1,2 @@
 vnsiserver/allowed_hosts.conf etc/vdr/plugins/vnsiserver
-debian/plugin.vnsiserver.conf etc/vdr/plugins
+debian/vnsiserver.conf        etc/vdr/conf.avail/
diff --git a/debian/vnsiserver.conf b/debian/vnsiserver.conf
new file mode 100644
index 0000000..92d3840
--- /dev/null
+++ b/debian/vnsiserver.conf
@@ -0,0 +1,7 @@
+#
+# VNSI-Server VDR plugin arguments
+#
+
+[vnsiserver]
+
+-t 10

-- 
vdr-plugin-vnsiserver packaging