r1479 - in vdr/vdr-plugin-femon/trunk/debian: . patches

Thomas Günther tom-guest at costa.debian.org
Sat Nov 12 21:11:25 UTC 2005 

Author: tom-guest
Date: 2005-11-12 21:11:25 +0000 (Sat, 12 Nov 2005)
New Revision: 1479

Added:
   vdr/vdr-plugin-femon/trunk/debian/compat
Modified:
   vdr/vdr-plugin-femon/trunk/debian/changelog
   vdr/vdr-plugin-femon/trunk/debian/control
   vdr/vdr-plugin-femon/trunk/debian/copyright
   vdr/vdr-plugin-femon/trunk/debian/install
   vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch
   vdr/vdr-plugin-femon/trunk/debian/rules
   vdr/vdr-plugin-femon/trunk/debian/watch
Log:
Using debian/compat now, adapted to vdrdevel-plugin-femon

Modified: vdr/vdr-plugin-femon/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/changelog	2005-11-08 18:33:23 UTC (rev 1478)
+++ vdr/vdr-plugin-femon/trunk/debian/changelog	2005-11-12 21:11:25 UTC (rev 1479)
@@ -1,3 +1,12 @@
+vdr-plugin-femon (0.9.4-2) unstable; urgency=low
+
+  * Thomas Günther <tom at toms-cafe.de>
+    - Build-Depend on vdr-dev (>= 1.3.33-1)
+    - Using debian/compat now
+    - Adapted to vdrdevel-plugin-femon
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat, 12 Nov 2005 20:25:26 +0100
+
 vdr-plugin-femon (0.9.4-1) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>

Added: vdr/vdr-plugin-femon/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/compat	2005-11-08 18:33:23 UTC (rev 1478)
+++ vdr/vdr-plugin-femon/trunk/debian/compat	2005-11-12 21:11:25 UTC (rev 1479)
@@ -0,0 +1 @@
+4

Modified: vdr/vdr-plugin-femon/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/control	2005-11-08 18:33:23 UTC (rev 1478)
+++ vdr/vdr-plugin-femon/trunk/debian/control	2005-11-12 21:11:25 UTC (rev 1479)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.3.35-1),  dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.33-1),  dpatch (>= 2.0.9)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-femon

Modified: vdr/vdr-plugin-femon/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/copyright	2005-11-08 18:33:23 UTC (rev 1478)
+++ vdr/vdr-plugin-femon/trunk/debian/copyright	2005-11-12 21:11:25 UTC (rev 1479)
@@ -5,8 +5,6 @@
 Upstream Author: Rolf Ahrenberg <Rolf.Ahrenberg AT sci.fi>
 
 Copyright:
-       
-       You are free to distribute this software under the terms of
-       the GNU General Public License.
-       On Debian systems, the complete text of the GNU General Public
-       License can be found in /usr/share/common-licenses/GPL file.
+
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .

Modified: vdr/vdr-plugin-femon/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/install	2005-11-08 18:33:23 UTC (rev 1478)
+++ vdr/vdr-plugin-femon/trunk/debian/install	2005-11-12 21:11:25 UTC (rev 1479)
@@ -1 +1 @@
-libvdr-femon*.so.* usr/lib/vdr/plugins/
+libvdr-femon.so.*               usr/lib/vdr/plugins/

Modified: vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch	2005-11-08 18:33:23 UTC (rev 1478)
+++ vdr/vdr-plugin-femon/trunk/debian/patches/10_stuttering.dpatch	2005-11-12 21:11:25 UTC (rev 1479)
@@ -1,15 +1,14 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
 
-## femon-0.9.0-stuttering patch - by Thomas Günther <tom at toms-cafe.de>
-## http://toms-cafe.de/vdr/download/femon-0.9.0-stuttering.diff
+## 10_stuttering.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/femon-0.9.1-stuttering.diff
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Make femon compile if VDR is patched with stuttering patch.
 
 @DPATCH@
-diff -urNad vdr-plugin-femon-0.9.1/femonosd.c /tmp/dpep.AnUWn8/vdr-plugin-femon-0.9.1/femonosd.c
---- vdr-plugin-femon-0.9.1/femonosd.c	2005-08-09 21:55:51.503534912 +0200
-+++ /tmp/dpep.AnUWn8/vdr-plugin-femon-0.9.1/femonosd.c	2005-08-09 21:57:44.894296896 +0200
+--- femon-0.9.0/femonosd.c
++++ femon-0.9.0/femonosd.c
 @@ -1065,7 +1065,11 @@
                        cControl::Shutdown();
                        cDevice::GetDevice(device)->SwitchChannel(channel, true);

Modified: vdr/vdr-plugin-femon/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/rules	2005-11-08 18:33:23 UTC (rev 1478)
+++ vdr/vdr-plugin-femon/trunk/debian/rules	2005-11-12 21:11:25 UTC (rev 1479)
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -17,11 +14,10 @@
 
 # Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
 VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+    DPATCH=yes
+endif
 
-PACKAGE=$(VDR)-plugin-femon
-VDRDIR=/usr/include/$(VDR)
-DVBDIR=/usr/include
-
 # To use dpatch uncomment the following line and set Build-Depends to dpatch
 DPATCH=yes
 
@@ -34,30 +30,23 @@
 endif
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
 	dh_testdir
-
 	touch configure-stamp
 
-
-build: patch-stamp build-stamp
-
-build-stamp: configure-stamp 
+build: build-stamp
+build-stamp: configure-stamp
 	dh_testdir
-
-	$(MAKE) all DVBDIR=$(DVBDIR) VDRDIR=$(VDRDIR) LIBDIR=.
-
+	$(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
 	touch build-stamp
 
 clean: clean-patched unpatch
-
 clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	rm -f libvdr-*.so*
-	-make clean
-
+	-$(MAKE) -o .dependencies clean
+	rm -f libvdr-*.so.*
 	dh_clean
 
 install: build
@@ -75,18 +64,27 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+#	dh_installdebconf
 	dh_installdocs
 	dh_installexamples
-	dh_installmenu
-	dh_installcron
-	dh_installman
-	dh_installinfo
-	dh_installchangelogs HISTORY 
+#	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installman
+#	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs HISTORY
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
+#	dh_makeshlibs
 	dh_installdeb
+#	dh_perl
 	dh_shlibdeps
 	/usr/lib/$(VDR)-dev/patchlevel.sh subst
 	/usr/lib/$(VDR)-dev/dependencies.sh
@@ -95,4 +93,5 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure
+.PHONY: build clean binary-indep binary-arch binary install configure \
+        clean-patched patch unpatch

Modified: vdr/vdr-plugin-femon/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/watch	2005-11-08 18:33:23 UTC (rev 1478)
+++ vdr/vdr-plugin-femon/trunk/debian/watch	2005-11-12 21:11:25 UTC (rev 1479)
@@ -1,2 +1,2 @@
 version=2
-http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-(.*)\.t.*z
+http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-(.*)\.(?:tgz|tar\.gz)

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