[SCM] vdr-plugin-xine packaging repository branch, master, updated. debian/0.9.4-2-1-g76ca1bc

[Darren Salt]

The following commit has been merged in the master branch:
commit 76ca1bcaf0c3d95cfa6112b08ac7ddde1341ebfc
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Wed Jan 25 00:10:39 2012 +0000

    Switch to debhelper 7.

diff --git a/debian/changelog b/debian/changelog
index 4d82e97..196c0b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vdr-plugin-xine (0.9.4-3) UNRELEASED; urgency=low
+
+  * Switched to debhelper 7.
+  * Adjust for libxine2-dev.
+
+ -- Darren Salt <linux at youmustbejoking.demon.co.uk>  Wed, 25 Jan 2012 00:09:32 +0000
+
 vdr-plugin-xine (0.9.4-2) experimental; urgency=low
 
   * Switched to GIT using pristine tar
diff --git a/debian/control b/debian/control
index b3e6709..8f1631b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Darren Salt <linux at youmustbejoking.demon.co.uk>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-5), gettext, libxine-dev (>= 1.1.90hg+20080321+5ac9723858b2)
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.6.0-5), gettext, libxine-dev (>= 1.1.90hg+20080321+5ac9723858b2)
 Standards-Version: 3.8.3
 Homepage: http://home.vr-web.de/~rnissl/
 Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-xine.git
diff --git a/debian/rules b/debian/rules
index 7d001e2..1469803 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,24 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/dpatch.mk
-
-DEB_INSTALL_CHANGELOGS_ALL = HISTORY
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
 MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
                LOCALEDIR=debian/tmp/usr/share/locale
 
-common-build-arch::
-	$(MAKE) all $(MAKE_OPTIONS)
+%:
+	dh --parallel $@
+
+override_dh_auto_build:
+	dh_auto_build -- all $(MAKE_OPTIONS)
 
-cleanbuilddir::
+override_dh_auto_clean:
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -f libvdr-*.so.*
+	rm -rf libvdr-*.so.*
 
-common-binary-predeb-arch::
+override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
+	dh_gencontrol
+
+override_dh_installchangelogs:
+	dh_installchangelogs -- HISTORY

-- 
vdr-plugin-xine packaging repository