r316 - vdr/vdr-plugin-femon/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2005-03-26 15:36:06 +0000 (Sat, 26 Mar 2005)
New Revision: 316

Modified:
   vdr/vdr-plugin-femon/trunk/debian/changelog
   vdr/vdr-plugin-femon/trunk/debian/control
   vdr/vdr-plugin-femon/trunk/debian/rules
Log:
vdr-plugin-femon:
	* Use patchlevel.sh subst in debian/rules not the old code,
      	  therefore Build-Depend on vdr (>=1.2.6-7)
	* prepared 0.0.7-3 for release


Modified: vdr/vdr-plugin-femon/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/changelog	2005-03-26 15:30:09 UTC (rev 315)
+++ vdr/vdr-plugin-femon/trunk/debian/changelog	2005-03-26 15:36:06 UTC (rev 316)
@@ -1,11 +1,11 @@
 vdr-plugin-femon (0.0.7-3) unstable; urgency=low
 
-  * NOT RELEASED YET
-  
   * Thomas Schmidt <tschmidt@debian.org>
+    - Use patchlevel.sh subst in debian/rules not the old code,
+      therefore Build-Depend on vdr (>=1.2.6-7)
     - Changed my email-address to the debian one
 
- -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Thu, 17 Mar 2005 20:12:19 +0100
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sat, 26 Mar 2005 16:33:58 +0100
 
 vdr-plugin-femon (0.0.7-2) unstable; urgency=low
 

Modified: vdr/vdr-plugin-femon/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/control	2005-03-26 15:30:09 UTC (rev 315)
+++ vdr/vdr-plugin-femon/trunk/debian/control	2005-03-26 15:36:06 UTC (rev 316)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg@e-tobi.net>, Thomas Schmidt <tschmidt@debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.2.6-4), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.2.6-7), dpatch (>= 2.0.9)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-femon

Modified: vdr/vdr-plugin-femon/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/rules	2005-03-26 15:30:09 UTC (rev 315)
+++ vdr/vdr-plugin-femon/trunk/debian/rules	2005-03-26 15:36:06 UTC (rev 316)
@@ -18,7 +18,9 @@
 	INSTALL_PROGRAM += -s
 endif
 
-VDR=vdr
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
+VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+
 PACKAGE=$(VDR)-plugin-femon
 VDRDIR=/usr/include/$(VDR)
 DVBDIR=/usr/include
@@ -78,15 +80,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-
-# VDR can be customized with quite a lot of different patches, which can make
-# the plugins binary incompatible.
-# Although Debian will not provide different binary packages for VDR, we
-# will include a patchlevel info, which is created at compile time and can
-# be checked before a plugin is loaded.
-	[ -r $(VDRDIR)/patchlevel ] || echo 'patchlevel=' >> debian/$(PACKAGE).substvars
-	[ ! -r $(VDRDIR)/patchlevel ] || cat $(VDRDIR)/patchlevel >> debian/$(PACKAGE).substvars
-
+	/usr/lib/$(VDR)-dev/patchlevel.sh subst
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb