[SCM] vdr-plugin-sysinfo packaging repository branch, master, updated. debian/0.1.0a-17-3-g31bf0d3

[etobi]

The following commit has been merged in the master branch:
commit 196e1593518b607d73afdfb2341218dc13f3073f
Author: etobi <git at e-tobi.net>
Date:   Fri May 18 20:39:59 2012 +0200

    Switched to debhelper 7 and dropped cdbs

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 54d6fec..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-This package uses the dpatch system to save and apply patches to the
-upstream source code of the software that is packaged. For details
-about how to use dpatch read
-
-   /usr/share/doc/dpatch/README.source.gz
-
-from the dpatch package.
diff --git a/debian/changelog b/debian/changelog
index b80651d..fdb33d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-sysinfo (0.1.0a-18) experimental; urgency=low
+
+  * Switched to debhelper 7 and dropped cdbs
+
+ -- Tobias Grimm <etobi at debian.org>  Fri, 18 May 2012 20:39:29 +0200
+
 vdr-plugin-sysinfo (0.1.0a-17) experimental; urgency=low
 
   * Switched to GIT using pristine tar
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 9ed66ba..1b78910 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: video
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.27)
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-sysinfo.git
 Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr-plugin-sysinfo.git
 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 64244ab..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-01_Makefile-fPIC-fix
-01_sysinfo-0.1.0a-fontfix
-02_sysinfo.sh-path
-03_gcc-4.3
-04_sysinfo-0.1.0a-meminfo
diff --git a/debian/patches/01_Makefile-fPIC-fix.dpatch b/debian/patches/01_Makefile-fPIC-fix.patch
similarity index 100%
rename from debian/patches/01_Makefile-fPIC-fix.dpatch
rename to debian/patches/01_Makefile-fPIC-fix.patch
diff --git a/debian/patches/01_sysinfo-0.1.0a-fontfix.dpatch b/debian/patches/01_sysinfo-0.1.0a-fontfix.patch
similarity index 100%
rename from debian/patches/01_sysinfo-0.1.0a-fontfix.dpatch
rename to debian/patches/01_sysinfo-0.1.0a-fontfix.patch
diff --git a/debian/patches/02_sysinfo.sh-path.dpatch b/debian/patches/02_sysinfo.sh-path.patch
similarity index 100%
rename from debian/patches/02_sysinfo.sh-path.dpatch
rename to debian/patches/02_sysinfo.sh-path.patch
diff --git a/debian/patches/03_gcc-4.3.dpatch b/debian/patches/03_gcc-4.3.patch
similarity index 100%
rename from debian/patches/03_gcc-4.3.dpatch
rename to debian/patches/03_gcc-4.3.patch
diff --git a/debian/patches/04_sysinfo-0.1.0a-meminfo.dpatch b/debian/patches/04_sysinfo-0.1.0a-meminfo.patch
similarity index 100%
rename from debian/patches/04_sysinfo-0.1.0a-meminfo.dpatch
rename to debian/patches/04_sysinfo-0.1.0a-meminfo.patch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..709967b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+01_Makefile-fPIC-fix.patch
+01_sysinfo-0.1.0a-fontfix.patch
+02_sysinfo.sh-path.patch
+03_gcc-4.3.patch
+04_sysinfo-0.1.0a-meminfo.patch
diff --git a/debian/rules b/debian/rules
index b81598f..6c9a1b2 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 = HISTORY
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale STRIP=/bin/true
 
-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-sysinfo packaging repository