r1138 - vdr/vdr-plugin-xine/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2005-09-01 19:27:57 +0000 (Thu, 01 Sep 2005)
New Revision: 1138

Modified:
   vdr/vdr-plugin-xine/trunk/debian/changelog
   vdr/vdr-plugin-xine/trunk/debian/control
   vdr/vdr-plugin-xine/trunk/debian/rules
Log:
vdr-plugin-xine: use dependencies.sh and new patchlevel.sh

Modified: vdr/vdr-plugin-xine/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/changelog	2005-09-01 19:25:53 UTC (rev 1137)
+++ vdr/vdr-plugin-xine/trunk/debian/changelog	2005-09-01 19:27:57 UTC (rev 1138)
@@ -3,8 +3,9 @@
   * NOT RELEASED YET
 
   * Thomas Schmidt <tschmidt at debian.org>
-    - Depend/Build-Depend on vdr (>=1.3.31-1)
-    - Conflict with vdr (>=1.3.31.99)
+    - Build-Depend on vdr (>=1.3.31-1)
+    - Use dependencies.sh from vdr-dev to set vdr dependencies and
+      conflicts to the right vdr version when building the package
 
  -- Thomas Schmidt <tschmidt at debian.org>  Sun, 28 Aug 2005 19:45:52 +0200
 

Modified: vdr/vdr-plugin-xine/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/control	2005-09-01 19:25:53 UTC (rev 1137)
+++ vdr/vdr-plugin-xine/trunk/debian/control	2005-09-01 19:27:57 UTC (rev 1138)
@@ -8,8 +8,8 @@
 
 Package: vdr-plugin-xine
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (>=1.3.31-1)
-Conflicts: libxine1 (<< 1.0.2-0vdr1), vdr (>=1.3.31.99)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
+Conflicts: libxine1 (<< 1.0.2-0vdr1), ${vdr:Conflicts}
 Recommends: libxine1
 Suggests: y4mscaler, mjpegtools
 Description: allows xine to be a display for vdr, the Video Disk Recorder
@@ -22,4 +22,4 @@
  .
  If you want to use the SVDRP 'grab' command, you'll need mjpegtools (from
  Christian Marillat's archive) and y4mscaler.
-XB-VDR-Patchlevel: ${patchlevel}
+XB-VDR-Patchlevel: ${vdr:Patchlevel}

Modified: vdr/vdr-plugin-xine/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/rules	2005-09-01 19:25:53 UTC (rev 1137)
+++ vdr/vdr-plugin-xine/trunk/debian/rules	2005-09-01 19:27:57 UTC (rev 1138)
@@ -81,6 +81,7 @@
 	dh_installdeb
 	dh_shlibdeps
 	/usr/lib/$(VDR)-dev/patchlevel.sh subst
+	/usr/lib/$(VDR)-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb