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

[Tobias Grimm]

Author: tiber-guest
Date: 2005-08-15 22:18:11 +0000 (Mon, 15 Aug 2005)
New Revision: 980

Modified:
   vdr/vdr-plugin-xine/branches/network/debian/changelog
   vdr/vdr-plugin-xine/branches/network/debian/control
Log:
New vdr 1.3.29

Modified: vdr/vdr-plugin-xine/branches/network/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/changelog	2005-08-15 22:09:08 UTC (rev 979)
+++ vdr/vdr-plugin-xine/branches/network/debian/changelog	2005-08-15 22:18:11 UTC (rev 980)
@@ -1,3 +1,11 @@
+vdr-plugin-xine (0.7.4-6net1) unstable; urgency=low
+ 
+  * Thomas Schmidt <tschmidt at debian.org>
+    - Depend/Build-Depend on vdr (>=1.3.29-1)
+    - Conflict with vdr (>=1.3.29.99)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Mon, 15 Aug 2005 19:56:15 +0200
+
 vdr-plugin-xine (0.7.4-5net1) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdr-plugin-xine/branches/network/debian/control
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/control	2005-08-15 22:09:08 UTC (rev 979)
+++ vdr/vdr-plugin-xine/branches/network/debian/control	2005-08-15 22:18:11 UTC (rev 980)
@@ -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.1-1vdr2), vdr-dev (>=1.3.28-1)
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.1-1vdr2), vdr-dev (>=1.3.29-1)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-xine
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (>=1.3.28-1)
-Conflicts: libxine1 (<< 1.0.1-1vdr2), vdr (>=1.3.29)
+Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (>=1.3.29-1)
+Conflicts: libxine1 (<< 1.0.1-1vdr2), vdr (>=1.3.29.99)
 Recommends: libxine1
 Suggests: y4mscaler, mjpegtools
 Description: allows xine to be a display for vdr, the Video Disk Recorder