[SCM] VLC media player packaging branch, experimental, updated. debian/1.1.2-1+exp1-18-g968f005

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

The following commit has been merged in the experimental branch:
commit 968f00579da29029f44540571e7d7ac997f4fcd6
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Aug 19 22:19:52 2010 +0200

    Bump version of vlc in vlc-nox's Replaces to reduce the diff to Ubuntu.
    
    Git-Dch: ignore

diff --git a/debian/control b/debian/control
index 08889c9..20a84a0 100644
--- a/debian/control
+++ b/debian/control
@@ -263,7 +263,7 @@ Package: vlc-nox
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Replaces: vlc (<< 1.0.4-2)
+Replaces: vlc (<< 1.1.0)
 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