[SCM] vdr-plugin-vompserver packaging repository branch, master, updated. debian/0.3.1-4

[etobi]

The following commit has been merged in the master branch:
commit bd15349be4b49446ccf4fe8fd968fc6d5231ee5f
Author: etobi <git at e-tobi.net>
Date:   Tue May 8 13:51:20 2012 +0200

    Switched to debhelper 7 and dropped cdbs / dpatch

diff --git a/debian/changelog b/debian/changelog
index 6aa1c16..366d775 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ vdr-plugin-vompserver (0.3.1-4) experimental; urgency=low
   * Standards-Version: 3.9.3
   * Build-Depend on vdr >= 1.7.27
   * Fixed GCC issue 
+  * Switched to debhelper 7 and dropped cdbs / dpatch
 
  -- Tobias Grimm <etobi at debian.org>  Tue, 08 May 2012 13:30:04 +0200
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index b76c81b..1160ea2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Marten Richter <marten.richter at freenet.de>, Tobias Grimm <etobi at debian.org>
 Origin: ctvdr
-Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.7.27)
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.27)
 Standards-Version: 3.9.3
 
 Package: vdr-plugin-vompserver
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 5e219ab..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-10-rrprocstart
-vdr1.7.27
-gcc-fixes.dpatch
diff --git a/debian/patches/10-rrprocstart.dpatch b/debian/patches/10-rrprocstart.patch
similarity index 100%
rename from debian/patches/10-rrprocstart.dpatch
rename to debian/patches/10-rrprocstart.patch
diff --git a/debian/patches/gcc-fixes.dpatch b/debian/patches/gcc-fixes.patch
similarity index 100%
rename from debian/patches/gcc-fixes.dpatch
rename to debian/patches/gcc-fixes.patch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ab1b664
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+10-rrprocstart.patch
+vdr1.7.27.patch
+gcc-fixes.patch
diff --git a/debian/patches/vdr1.7.27.dpatch b/debian/patches/vdr1.7.27.patch
similarity index 100%
rename from debian/patches/vdr1.7.27.dpatch
rename to debian/patches/vdr1.7.27.patch
diff --git a/debian/rules b/debian/rules
index 93ad411..9f487b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,20 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_INSTALL_CHANGELOGS_ALL = 
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
 
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
-               LOCALEDIR=debian/tmp/usr/share/locale
+%:
+	dh $@
 
-common-build-arch::
-	$(MAKE) all $(MAKE_OPTIONS)
+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 locale libvdr-*.so.*
 
-common-binary-predeb-arch::
+override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
+	dh_gencontrol
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
vdr-plugin-vompserver packaging repository