[SCM] VLC media player packaging branch, sid, updated. debian/1.0.4-2-3-ga252a4a

[siretart at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit 667f9cf246d16ab3c507af95735406be461a16e0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 8 21:51:47 2010 +0100

    remove excessive replaces relationship
    
    We do not need to force the removal of the packages that contained some
    files with identical paths in earlier versions. Instead, we want to
    takeover the files.  Package cleanup can be done at some later point,
    e.g., with 'apt-get autoremove' or similar frontends.

diff --git a/debian/control b/debian/control
index 595d437..2d55864 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,6 @@ Recommends: vlc-plugin-pulse (= ${binary:Version})
 Suggests: mozilla-plugin-vlc,
           videolan-doc
 Replaces: vlc-nox (<< 1.0.4-2)
-Conflicts: vlc-nox (<< 1.0.4-2)
 Provides: mp3-decoder
 Description: multimedia player and streamer
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -136,7 +135,6 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Replaces: vlc (<< 1.0.4-2)
-Conflicts: vlc (<< 1.0.4-2)
 Provides: mp3-decoder
 Description: multimedia player and streamer (without X support)
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -177,7 +175,6 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Replaces: vlc (<< 0.8.6.c-6)
-Conflicts: vlc (<< 0.8.6.c-6)
 Description: multimedia player and streamer library
  This package contains the shared library required by applications using VLC
  features.
@@ -205,7 +202,6 @@ Architecture: any
 Depends: libvlc2 (= ${binary:Version}), libvlccore-dev, pkg-config,
          ${shlibs:Depends}, ${misc:Depends}
 Replaces: libvlc0-dev
-Conflicts: libvlc0-dev
 Description: development files for libvlc
  This package contains headers and a static library required to build 
  standalone applications that use VLC features.
@@ -312,7 +308,6 @@ Description: SVG plugin for VLC
 
 Package: vlc-data
 Architecture: all
-Conflicts: vlc-nox (<< 0.9.2-1), mozilla-plugin-vlc (<< 0.9.2-1)
 Replaces: vlc-nox (<< 0.9.2-1), mozilla-plugin-vlc (<< 0.9.2-1)
 Description: Common data for VLC
  Localisations, HTTP interface files, Lua scripts for VLC media player 

-- 
VLC media player packaging