[SCM] vdr-plugin-control packaging repository branch, master, updated. debian/0.0.2a-40-1-gbfbb90c

etobi git at e-tobi.net
Wed Jul 18 07:49:33 UTC 2012 

The following commit has been merged in the master branch:
commit bfbb90c04199f3594e4924265d6b1ea4492de7ce
Author: etobi <git at e-tobi.net>
Date:   Wed Jul 18 09:48:33 2012 +0200

    Build-depend on vdr-dev >= 1.7.28
    
    * Build-depend on vdr-dev >= 1.7.28
    * Standards-Version: 3.9.3
    * Switched to debhelper 7 and dropped cdbs

diff --git a/debian/changelog b/debian/changelog
index 55ef1a8..2724929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vdr-plugin-control (0.0.2a-41) experimental; urgency=low
+
+  * Build-depend on vdr-dev >= 1.7.28
+  * Standards-Version: 3.9.3
+  * Switched to debhelper 7 and dropped cdbs
+
+ -- Tobias Grimm <etobi at debian.org>  Wed, 18 Jul 2012 09:47:13 +0200
+
 vdr-plugin-control (0.0.2a-40) experimental; urgency=low
 
   * Removed non-standard shebang line from debian/rules
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 57198e3..cc5e94b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
 Maintainer: Rene Bartsch <ml at bartschnet.de>
 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 (>= 9), vdr-dev (>= 1.7.28)
+Standards-Version: 3.9.3
 
 Package: vdr-plugin-control
 Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 07d333a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,7 +0,0 @@
-01_Makefile-fPIC-fix
-02_gateway
-
-90_APIVERSION
-92_control-1.3.18
-93_control-0.0.2a-1.5.0
-94_gcc-4.4
diff --git a/debian/patches/01_Makefile-fPIC-fix.dpatch b/debian/patches/01_Makefile-fPIC-fix.patch
similarity index 59%
rename from debian/patches/01_Makefile-fPIC-fix.dpatch
rename to debian/patches/01_Makefile-fPIC-fix.patch
index 3380b8f..6650e24 100644
--- a/debian/patches/01_Makefile-fPIC-fix.dpatch
+++ b/debian/patches/01_Makefile-fPIC-fix.patch
@@ -6,10 +6,11 @@
 ## DP: Adds -fPIC to Makefile to fix potential FTBFS.
 
 @DPATCH@
-diff -urNad /usr/src/cvs/vdrdevel-plugin-rotor/Makefile vdrdevel-plugin-rotor/Makefile
---- /usr/src/cvs/vdrdevel-plugin-rotor/Makefile	Sun May 16 15:48:12 2004
-+++ vdrdevel-plugin-rotor/Makefile	Sat Sep 11 00:28:18 2004
-@@ -18,7 +18,7 @@
+Index: vdr-plugin-control/Makefile
+===================================================================
+--- vdr-plugin-control.orig/Makefile	2012-07-18 09:41:03.000000000 +0200
++++ vdr-plugin-control/Makefile	2012-07-18 09:43:06.000000000 +0200
+@@ -16,7 +16,7 @@
  ### The C++ compiler and options:
  
  CXX      ?= g++
diff --git a/debian/patches/02_gateway.dpatch b/debian/patches/02_gateway.patch
similarity index 77%
rename from debian/patches/02_gateway.dpatch
rename to debian/patches/02_gateway.patch
index 5f46c18..0332715 100644
--- a/debian/patches/02_gateway.dpatch
+++ b/debian/patches/02_gateway.patch
@@ -6,9 +6,10 @@
 ## DP: see: http://www.vdr-portal.de/board/thread.php?threadid=49680
 
 @DPATCH@
-diff -urNad vdr-plugin-control-0.0.2a~/gateway.c vdr-plugin-control-0.0.2a/gateway.c
---- vdr-plugin-control-0.0.2a~/gateway.c	2004-07-02 21:24:22.000000000 +0200
-+++ vdr-plugin-control-0.0.2a/gateway.c	2007-04-12 22:51:16.000000000 +0200
+Index: vdr-plugin-control/gateway.c
+===================================================================
+--- vdr-plugin-control.orig/gateway.c	2012-07-18 09:41:03.000000000 +0200
++++ vdr-plugin-control/gateway.c	2012-07-18 09:43:13.000000000 +0200
 @@ -36,7 +36,7 @@
    _pTelnet	(0),
    _pFormatter   (0)
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..1361dda
--- /dev/null
+++ b/debian/patches/90_APIVERSION.patch
@@ -0,0 +1,22 @@
+Index: vdr-plugin-control/Makefile
+===================================================================
+--- vdr-plugin-control.orig/Makefile	2012-07-18 09:43:06.000000000 +0200
++++ vdr-plugin-control/Makefile	2012-07-18 09:44:09.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')
+ 
+ ### The name of the distribution archive:
+ 
+@@ -54,7 +54,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/92_control-1.3.18.dpatch b/debian/patches/92_control-1.3.18.patch
similarity index 78%
rename from debian/patches/92_control-1.3.18.dpatch
rename to debian/patches/92_control-1.3.18.patch
index 0e6a100..d31fb89 100644
--- a/debian/patches/92_control-1.3.18.dpatch
+++ b/debian/patches/92_control-1.3.18.patch
@@ -6,8 +6,10 @@
 ## DP: Changes for VDR >= 1.3.18.
 
 @DPATCH@
---- control-0.0.2a/gateway.c
-+++ control-0.0.2a/gateway.c
+Index: vdr-plugin-control/gateway.c
+===================================================================
+--- vdr-plugin-control.orig/gateway.c	2012-07-18 09:43:13.000000000 +0200
++++ vdr-plugin-control/gateway.c	2012-07-18 09:44:28.000000000 +0200
 @@ -102,7 +102,12 @@
  
        uint64 Command = 0;
diff --git a/debian/patches/93_control-0.0.2a-1.5.0.dpatch b/debian/patches/93_control-0.0.2a-1.5.0.patch
similarity index 68%
rename from debian/patches/93_control-0.0.2a-1.5.0.dpatch
rename to debian/patches/93_control-0.0.2a-1.5.0.patch
index a7ebfe3..47d108a 100644
--- a/debian/patches/93_control-0.0.2a-1.5.0.dpatch
+++ b/debian/patches/93_control-0.0.2a-1.5.0.patch
@@ -5,8 +5,10 @@
 ## DP: Changes for VDR >= 1.5.0 (applicable to VDR >= 1.4.5).
 
 @DPATCH@
---- control-0.0.2a/gateway.c
-+++ control-0.0.2a/gateway.c
+Index: vdr-plugin-control/gateway.c
+===================================================================
+--- vdr-plugin-control.orig/gateway.c	2012-07-18 09:44:28.000000000 +0200
++++ vdr-plugin-control/gateway.c	2012-07-18 09:44:33.000000000 +0200
 @@ -100,7 +100,7 @@
  
      if (_stack.poll(100)) {
@@ -14,10 +16,12 @@
 -      uint64 Command = 0;
 +      uint64_t Command = 0;
        uint i = 0;
-       int t0 = time_ms();
-       while (_active && i < sizeof(Command)) {
---- control-0.0.2a/keyboard.c
-+++ control-0.0.2a/keyboard.c
+ #if VDRVERSNUM >= 10318
+       cTimeMs timeout;
+Index: vdr-plugin-control/keyboard.c
+===================================================================
+--- vdr-plugin-control.orig/keyboard.c	2012-07-18 09:41:04.000000000 +0200
++++ vdr-plugin-control/keyboard.c	2012-07-18 09:44:33.000000000 +0200
 @@ -18,7 +18,7 @@
  
  struct tKbdMap {
@@ -54,8 +58,10 @@
  
    for (const tKbdMap *p = keyboardKbdMap; p->func != kfNone; p++) {
      if (p->code == Code)
---- control-0.0.2a/keyboard.h
-+++ control-0.0.2a/keyboard.h
+Index: vdr-plugin-control/keyboard.h
+===================================================================
+--- vdr-plugin-control.orig/keyboard.h	2012-07-18 09:41:03.000000000 +0200
++++ vdr-plugin-control/keyboard.h	2012-07-18 09:44:33.000000000 +0200
 @@ -30,11 +30,11 @@
    cCtrlKeyboard();
    virtual ~cCtrlKeyboard();
diff --git a/debian/patches/94_gcc-4.4.dpatch b/debian/patches/94_gcc-4.4.patch
similarity index 68%
rename from debian/patches/94_gcc-4.4.dpatch
rename to debian/patches/94_gcc-4.4.patch
index 09292c7..13fe414 100644
--- a/debian/patches/94_gcc-4.4.dpatch
+++ b/debian/patches/94_gcc-4.4.patch
@@ -5,9 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad vdr-plugin-control-0.0.2a~/formatter.c vdr-plugin-control-0.0.2a/formatter.c
---- vdr-plugin-control-0.0.2a~/formatter.c	2004-07-02 21:24:22.000000000 +0200
-+++ vdr-plugin-control-0.0.2a/formatter.c	2009-11-11 22:07:56.000000000 +0100
+Index: vdr-plugin-control/formatter.c
+===================================================================
+--- vdr-plugin-control.orig/formatter.c	2012-07-18 09:41:03.000000000 +0200
++++ vdr-plugin-control/formatter.c	2012-07-18 09:44:38.000000000 +0200
 @@ -165,7 +165,7 @@
  
    if (Title) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..90d1062
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+01_Makefile-fPIC-fix.patch
+02_gateway.patch
+
+90_APIVERSION.patch
+92_control-1.3.18.patch
+93_control-0.0.2a-1.5.0.patch
+94_gcc-4.4.patch
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/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-control packaging repository

More information about the pkg-vdr-dvb-changes mailing list