r1196 - vdr/vdr-plugin-xine/branches/network/debian

[Tobias Grimm]

Author: tiber-guest
Date: 2005-09-02 22:50:52 +0000 (Fri, 02 Sep 2005)
New Revision: 1196

Modified:
   vdr/vdr-plugin-xine/branches/network/debian/changelog
   vdr/vdr-plugin-xine/branches/network/debian/control
   vdr/vdr-plugin-xine/branches/network/debian/rules
Log:
synced with 0.7.5-2

Modified: vdr/vdr-plugin-xine/branches/network/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/changelog	2005-09-02 22:34:09 UTC (rev 1195)
+++ vdr/vdr-plugin-xine/branches/network/debian/changelog	2005-09-02 22:50:52 UTC (rev 1196)
@@ -1,3 +1,19 @@
+vdr-plugin-xine (0.7.5-2net1) unstable; urgency=low
+
+  * Tobias Grimm <tg at e-tobi.net>
+    - Synced with 0.7.5-2
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat,  3 Sep 2005 00:55:45 +0200
+
+vdr-plugin-xine (0.7.5-2) unstable; urgency=low
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - 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
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 28 Aug 2005 19:45:52 +0200
+
 vdr-plugin-xine (0.7.5-1net2) unstable; urgency=low
 
   * Tobias Grimm <tg at e-tobi.net>

Modified: vdr/vdr-plugin-xine/branches/network/debian/control
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/control	2005-09-02 22:34:09 UTC (rev 1195)
+++ vdr/vdr-plugin-xine/branches/network/debian/control	2005-09-02 22:50:52 UTC (rev 1196)
@@ -3,13 +3,13 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Darren Salt <linux at youmustbejoking.demon.co.uk>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.2-0vdr1), vdr-dev (>=1.3.30-1)
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.2-0vdr1), vdr-dev (>=1.3.31-1)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-xine
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (>=1.3.30-1)
-Conflicts: libxine1 (<< 1.0.2-0vdr1), vdr (>=1.3.30.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/branches/network/debian/rules
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/rules	2005-09-02 22:34:09 UTC (rev 1195)
+++ vdr/vdr-plugin-xine/branches/network/debian/rules	2005-09-02 22:50:52 UTC (rev 1196)
@@ -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