r424 - vdr/vdr-plugin-mp3/trunk/debian

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 10 Apr 2005 13:01:20 +0000


Author: tschmidt
Date: 2005-04-10 13:01:19 +0000 (Sun, 10 Apr 2005)
New Revision: 424

Modified:
   vdr/vdr-plugin-mp3/trunk/debian/changelog
   vdr/vdr-plugin-mp3/trunk/debian/control
   vdr/vdr-plugin-mp3/trunk/debian/rules
Log:
vdr-plugin-mp3:
    - Depend/Build-Depend on vdr (>=1.3.23-1)
    - Conflict with vdr (>=1.3.24)
    - debian/rules: use patchlevel.sh subst instead of the old code


Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/changelog	2005-04-10 13:00:26 UTC (rev 423)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog	2005-04-10 13:01:19 UTC (rev 424)
@@ -1,9 +1,12 @@
-vdr-plugin-mp3 (0.9.12-2) unstable; urgency=low
+vdr-plugin-mp3 (0.9.12-2) experimental; urgency=low
 
   * Not released Yet
 
   * Thomas Schmidt <tschmidt@debian.org>
+    - Depend/Build-Depend on vdr (>=1.3.23-1)
+    - Conflict with vdr (>=1.3.24)
     - Removed .dependencies from the source tree
+    - debian/rules: use patchlevel.sh subst instead of the old code
 
  -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 20 Mar 2005 11:53:36 +0100
 

Modified: vdr/vdr-plugin-mp3/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/control	2005-04-10 13:00:26 UTC (rev 423)
+++ vdr/vdr-plugin-mp3/trunk/debian/control	2005-04-10 13:01:19 UTC (rev 424)
@@ -3,13 +3,13 @@
 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), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, vdr-dev (>=1.1.25), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, vdr-dev (>=1.3.23-1), dpatch (>= 2.0.9)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-mp3
 Architecture: any
-Depends: ${shlibs:Depends}, vdr (>=1.2.6)
-Conflicts: vdr (>=1.2.7)
+Depends: ${shlibs:Depends}, vdr (>=1.3.23-1)
+Conflicts: vdr (>=1.3.24)
 Description: Plugin to vdr for playing mp3's
  This plugin for vdr allows you to play mp3's, ogg-files and 
  audio-cds.

Modified: vdr/vdr-plugin-mp3/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/rules	2005-04-10 13:00:26 UTC (rev 423)
+++ vdr/vdr-plugin-mp3/trunk/debian/rules	2005-04-10 13:01:19 UTC (rev 424)
@@ -85,16 +85,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