r314 - vdr/vdr-plugin-dvd/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2005-03-26 15:28:54 +0000 (Sat, 26 Mar 2005)
New Revision: 314

Modified:
   vdr/vdr-plugin-dvd/trunk/debian/changelog
   vdr/vdr-plugin-dvd/trunk/debian/control
   vdr/vdr-plugin-dvd/trunk/debian/rules
Log:
vdr-plugin-dvd:
     * use patchlevel.sh in debian/rules, therefore Build-Depend 
       on vdr (>=1.2.6-7)
     * prepared 0.3.4-rc10-2 for release


Modified: vdr/vdr-plugin-dvd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/changelog	2005-03-26 15:22:30 UTC (rev 313)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog	2005-03-26 15:28:54 UTC (rev 314)
@@ -1,11 +1,11 @@
 vdr-plugin-dvd (0.3.4-rc10-2) 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:10:22 +0100
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sat, 26 Mar 2005 16:27:05 +0100
 
 vdr-plugin-dvd (0.3.4-rc10-1) unstable; urgency=low
 

Modified: vdr/vdr-plugin-dvd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/control	2005-03-26 15:22:30 UTC (rev 313)
+++ vdr/vdr-plugin-dvd/trunk/debian/control	2005-03-26 15:28:54 UTC (rev 314)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt@debian.org>
-Build-Depends: debhelper (>> 4.1.16), liba52-0.7.4-dev, vdr-dev (>=1.2.6), libdvdnav-dev (>=0.1.9), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), liba52-0.7.4-dev, vdr-dev (>=1.2.6-7), libdvdnav-dev (>=0.1.9), dpatch (>= 2.0.9)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-dvd

Modified: vdr/vdr-plugin-dvd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/rules	2005-03-26 15:22:30 UTC (rev 313)
+++ vdr/vdr-plugin-dvd/trunk/debian/rules	2005-03-26 15:28:54 UTC (rev 314)
@@ -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-dvd
 VDRDIR=/usr/include/$(VDR)
 DVBDIR=/usr/include
@@ -81,16 +83,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