[SCM] vdr-plugin-sleeptimer packaging repository branch, master, updated. upstream/0.7-8-g81701b2

[etobi]

The following commit has been merged in the master branch:
commit 1b84cf541a5cc1a648f047b8f2d058cf6a05ec3b
Author: etobi <git at e-tobi.net>
Date:   Fri May 18 02:22:25 2012 +0200

    Dropped cdbs in favour of debhelper 7

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 6ca2fd8..4e9642b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-sleeptimer (0.7-22) experimental; urgency=low
+
+  * Dropped cdbs in favour of debhelper 7
+
+ -- Tobias Grimm <etobi at debian.org>  Fri, 18 May 2012 02:21:42 +0200
+
 vdr-plugin-sleeptimer (0.7-21) experimental; urgency=low
 
   * Removed non-standard shebang line from debian/rules
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 14679df..feff955 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ Priority: extra
 Maintainer: Tobias Grimm <tg at e-tobi.net>
 Origin: ctvdr
 Bugs: mailto:pkg-vdr-dvb-devel at lists.alioth.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.17)
+Standards-Version: 3.9.3
 
 Package: vdr-plugin-sleeptimer
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
 Description: Sleeptimer plugin for vdr
- Allows to set a timer for powering off vdr once. 
+ Allows to set a timer for powering off vdr once.
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/00list b/debian/patches/series
similarity index 100%
rename from debian/patches/00list
rename to debian/patches/series
diff --git a/debian/rules b/debian/rules
index b81598f..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 = HISTORY
+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/watch b/debian/watch
index c37dd57..67f7131 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=2
-http://linvdr.org/download/vdr-sleeptimer/sleeptimer-(.*)\.tar\.gz
+http://projects.vdr-developer.org/projects/plg-sleeptimer/files .*/vdr-plugin-sleeptimer-(.*)\.tgz

-- 
vdr-plugin-sleeptimer packaging repository