[SCM] VLC media player packaging branch, sid, updated. debian/0.9.8a-3-9-g81a509f

xtophe-guest at users.alioth.debian.org xtophe-guest at users.alioth.debian.org
Thu Apr 2 22:31:08 UTC 2009


The following commit has been merged in the sid branch:
commit 6b65f543d057c77dc8af5f4819ed1a1fb7483343
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Thu Apr 2 23:11:09 2009 +0200

    Remove some Replaces/Conflicts against version not in etch

diff --git a/debian/control b/debian/control
index b713c3a..f1c7dcf 100644
--- a/debian/control
+++ b/debian/control
@@ -97,11 +97,8 @@ Depends: vlc-nox (= ${binary:Version}),
          ttf-dejavu-core
 Suggests: mozilla-plugin-vlc,
           videolan-doc
-Replaces: wxvlc (<< 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)
+Replaces:  vlc-nox (<< 0.9.2-1)
+Conflicts: 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,
@@ -139,12 +136,6 @@ Section: video
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Replaces: wxvlc (<< 0.8.5-test3.debian-4),
-          vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
-          vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
-Conflicts: wxvlc (<< 0.8.5-test3.debian-4),
-           vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
-           vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
 Provides: mp3-decoder
 Description: multimedia player and streamer (without X support)
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list