r529 - vdr/vdr-plugin-xine/branches/sarge/debian

[Tobias Grimm]

Author: tiber-guest
Date: 2005-05-14 19:11:34 +0000 (Sat, 14 May 2005)
New Revision: 529

Modified:
   vdr/vdr-plugin-xine/branches/sarge/debian/changelog
   vdr/vdr-plugin-xine/branches/sarge/debian/control
   vdr/vdr-plugin-xine/branches/sarge/debian/watch
Log:
vdr-plugin-xine: sarge backport

Modified: vdr/vdr-plugin-xine/branches/sarge/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/branches/sarge/debian/changelog	2005-05-14 13:14:23 UTC (rev 528)
+++ vdr/vdr-plugin-xine/branches/sarge/debian/changelog	2005-05-14 19:11:34 UTC (rev 529)
@@ -1,3 +1,14 @@
+vdr-plugin-xine (0.7.4-0sarge1) experimental; urgency=low
+
+  * Thomas Schmidt <tschmidt@debian.org>
+    - New upstream release
+    - Build-Depend on libxine-dev (>=1.0.1-1vdr2)
+    - Conflict with libxine1 (<< 1.0.1-vdr2)
+  * Tobias Grimm <tg@e-tobi.net>
+    - Backported unreleased 0.7.4-1 to Sarge
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Thu, 12 May 2005 20:37:13 +0200
+
 vdr-plugin-xine (0.7.3-0sarge1) experimental; urgency=low
 
   * Thomas Schmidt <tschmidt@debian.org> 

Modified: vdr/vdr-plugin-xine/branches/sarge/debian/control
===================================================================
--- vdr/vdr-plugin-xine/branches/sarge/debian/control	2005-05-14 13:14:23 UTC (rev 528)
+++ vdr/vdr-plugin-xine/branches/sarge/debian/control	2005-05-14 19:11:34 UTC (rev 529)
@@ -3,13 +3,13 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Darren Salt <linux@youmustbejoking.demon.co.uk>, Thomas Schmidt <tschmidt@debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0-1vdr7), vdr-dev (>=1.2.6)
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.1-1vdr2), vdr-dev (>=1.2.6)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-xine
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, vdr-dev (>=1.2.6)
-Conflicts: libxine1 (<< 1.0-1vdr7)
+Conflicts: libxine1 (<< 1.0.1-1vdr2)
 Recommends: libxine1
 Suggests: y4mscaler, mjpegtools
 Description: allows xine to be a display for vdr, the Video Disk Recorder

Modified: vdr/vdr-plugin-xine/branches/sarge/debian/watch
===================================================================
--- vdr/vdr-plugin-xine/branches/sarge/debian/watch	2005-05-14 13:14:23 UTC (rev 528)
+++ vdr/vdr-plugin-xine/branches/sarge/debian/watch	2005-05-14 19:11:34 UTC (rev 529)
@@ -1,2 +1,2 @@
 version=2
-http://home.vr-web.de/~rnissl/	vdr-xine-(\d.*)\.tgz	debian	uupdate
+http://home.vr-web.de/~rnissl/	vdr-xine-(\d.*)\.tgz