r1473 - in /experimental/vlc/debian: changelog control

[xtophe-guest at users.alioth.debian.org]

Author: xtophe-guest
Date: Tue Sep 16 22:40:26 2008
New Revision: 1473

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1473
Log:
screensaver module has gone from vlc-nox to vlc because even if it doesn't 
depends on libX11 it makes no sense on an headless system

Modified:
    experimental/vlc/debian/changelog
    experimental/vlc/debian/control

Modified: experimental/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/changelog?rev=1473&op=diff
==============================================================================
--- experimental/vlc/debian/changelog (original)
+++ experimental/vlc/debian/changelog Tue Sep 16 22:40:26 2008
@@ -43,9 +43,10 @@
   [ Mohammed Adnène Trojette ]
   * Add myself to Uploaders.
   * debian/control:
-    + Add proper conflicts/replaces to vlc-data with mozilla-plugin-vlc
-
- -- Mohammed Adnène Trojette <adn+deb at diwi.org>  Tue, 16 Sep 2008 23:12:55 +0200
+    + Add proper conflicts/replaces to vlc-data with mozilla-plugin-vlc.
+    + Add proper conflicts/replaces to vlc with vlc-nox.
+
+ -- Mohammed Adnène Trojette <adn+deb at diwi.org>  Wed, 17 Sep 2008 00:29:36 +0200
 
 vlc (0.8.6.i-2) experimental; urgency=high
 

Modified: experimental/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/control?rev=1473&op=diff
==============================================================================
--- experimental/vlc/debian/control (original)
+++ experimental/vlc/debian/control Tue Sep 16 22:40:26 2008
@@ -99,8 +99,10 @@
 Suggests: mozilla-plugin-vlc,
           videolan-doc
 Replaces: wxvlc (<< 0.8.5-test3.debian-4),
-          vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
-Conflicts: vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
+          vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
+          vlc-nox (<< 0.9.2-1)
+Conflicts: vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
+           vlc-nox (<< 0.9.2-1)
 Provides: mp3-decoder
 Description: multimedia player and streamer
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,