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

[Tobias Grimm]

Author: tiber-guest
Date: 2006-06-18 13:49:43 +0000 (Sun, 18 Jun 2006)
New Revision: 2940

Modified:
   vdr/vdr-plugin-xine/branches/network/debian/control
Log:
removed vdr:conflicts

Modified: vdr/vdr-plugin-xine/branches/network/debian/control
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/control	2006-06-18 13:49:38 UTC (rev 2939)
+++ vdr/vdr-plugin-xine/branches/network/debian/control	2006-06-18 13:49:43 UTC (rev 2940)
@@ -9,7 +9,6 @@
 Package: vdr-plugin-xine
 Architecture: any
 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