[SCM] VLC media player packaging branch, sid, updated. debian/1.0.4-1-5-g8bfca08

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

The following commit has been merged in the sid branch:
commit d513a29721a4d9531420cf1a1db33ce1eb056404
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Mon Jan 4 21:08:56 2010 +0100

    Fix Replaces/Conflicts version so that upgrade work
    
    Closes: #563476, #563483

diff --git a/debian/control b/debian/control
index e86f031..8f0aeb1 100644
--- a/debian/control
+++ b/debian/control
@@ -98,8 +98,8 @@ Depends: vlc-nox (= ${binary:Version}),
 Recommends: vlc-plugin-pulse (= ${binary:Version})
 Suggests: mozilla-plugin-vlc,
           videolan-doc
-Replaces: vlc-nox (<< 1.0.3-1)
-Conflicts: vlc-nox (<< 1.0.3-1)
+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,
@@ -135,8 +135,8 @@ Package: vlc-nox
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Replaces: vlc (<< 0.9.8a-3)
-Conflicts: vlc (<< 0.9.8a-3)
+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,

-- 
VLC media player packaging