[SCM] vdr-plugin-undelete packaging repository branch, master, updated. debian/0.0.6-29-3-ga2d95c3

Wed May 9 14:17:47 UTC 2012

The following commit has been merged in the master branch:
commit df8395415a37b9187eb829f04e9cf6ee2415ee58
Author: etobi <git at e-tobi.net>
Date:   Wed May 9 15:28:23 2012 +0200

    Switched to debhelper 7 and dropped cdbs

diff --git a/debian/changelog b/debian/changelog
index 7b0007e..15f8d80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vdr-plugin-undelete (0.0.6-30) experimental; urgency=low
+
+  * Standards-Version: 3.9.3
+  * Switched to debhelper 7 and dropped cdbs
+  * VDR 1.7.27 adaptation
+
+ -- Tobias Grimm <etobi at debian.org>  Wed, 09 May 2012 15:24:18 +0200
+
 vdr-plugin-undelete (0.0.6-29) 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 69422ed..35dfa42 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
 Maintainer: Hardy Flor <HFlor at gmx.de>
 Origin: ctvdr
 Bugs: mailto:pkg-vdr-dvb-devel at lists.alioth.debian.org
-Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-5), dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.27)
+Standards-Version: 3.9.3
 
 Package: vdr-plugin-undelete
 Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f623fd6..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_gcc44
-90_APIVERSION
-91_undelete-0.0.6-vdr-1.5.7
-92_undelete-0.0.6-1.7.3
diff --git a/debian/patches/01_gcc44.dpatch b/debian/patches/01_gcc44.patch
similarity index 100%
rename from debian/patches/01_gcc44.dpatch
rename to debian/patches/01_gcc44.patch
diff --git a/debian/patches/90_APIVERSION.dpatch b/debian/patches/90_APIVERSION.dpatch
deleted file mode 100644
index 2a60f84..0000000
--- a/debian/patches/90_APIVERSION.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-## 90_APIVERSION.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support for the APIVERSION define as introduced in VDR-1.3.47.
-
-case "$1" in
-    -patch)
-        sed -i -e s/VDRVERSION/APIVERSION/g Makefile
-        ;;
-    -unpatch)
-        sed -i -e s/APIVERSION/VDRVERSION/g Makefile
-        ;;
-     *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/debian/patches/90_APIVERSION.patch b/debian/patches/90_APIVERSION.patch
new file mode 100644
index 0000000..ba7649d
--- /dev/null
+++ b/debian/patches/90_APIVERSION.patch
@@ -0,0 +1,22 @@
+Index: vdr-plugin-undelete/Makefile
+===================================================================
+--- vdr-plugin-undelete.orig/Makefile	2012-05-09 15:27:31.000000000 +0200
++++ vdr-plugin-undelete/Makefile	2012-05-09 15:27:13.000000000 +0200
+@@ -31,7 +31,7 @@
+ 
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+ VDRVERSNUM = $(shell grep 'define VDRVERSNUM ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+ 
+ ### The name of the distribution archive:
+@@ -92,7 +92,7 @@
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/debian/patches/91_undelete-0.0.6-vdr-1.5.7.dpatch b/debian/patches/91_undelete-0.0.6-vdr-1.5.7.patch
similarity index 100%
rename from debian/patches/91_undelete-0.0.6-vdr-1.5.7.dpatch
rename to debian/patches/91_undelete-0.0.6-vdr-1.5.7.patch
diff --git a/debian/patches/92_undelete-0.0.6-1.7.3.dpatch b/debian/patches/92_undelete-0.0.6-1.7.3.patch
similarity index 100%
rename from debian/patches/92_undelete-0.0.6-1.7.3.dpatch
rename to debian/patches/92_undelete-0.0.6-1.7.3.patch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..708daa5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01_gcc44.patch
+90_APIVERSION.patch
+91_undelete-0.0.6-vdr-1.5.7.patch
+92_undelete-0.0.6-1.7.3.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-undelete packaging repository

