[SCM] VLC media player packaging branch, sid, updated. debian/1.1.0-4-8-g70106ea

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

The following commit has been merged in the sid branch:
commit 0d668bcc42e09e1927b62a0639cf0eafc340abdb
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Wed Jul 21 00:27:14 2010 +0200

    Disable modplug as libmodplug module in sid is buggy
    
    See #588465

diff --git a/debian/control b/debian/control
index e3f914f..ba9388e 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,6 @@ Build-Depends: debhelper (>= 7.2.3~),
                liblua5.1-0-dev,
                libmad0-dev,
                libmatroska-dev (>= 0.8.0),
-               libmodplug-dev,
                libmpcdec-dev,
                libmpeg2-4-dev,
                libmtp-dev,
diff --git a/debian/rules b/debian/rules
index cfb701b..7b126f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,6 +102,7 @@ confflags += \
 # gnomevfs -> poorly maintained
 # goom -> not in Debian
 # libva -> needs a vaapi enabled avcodec
+# modplug -> #588465
 # osso_screensaver -> not targetting maemo
 # portaudio -> not needed
 # projectm -> broken
@@ -113,6 +114,7 @@ confflags += \
 	--disable-gnomevfs \
 	--disable-goom \
 	--disable-libva \
+        --disable-mod \
 	--disable-osso_screensaver \
 	--disable-portaudio \
 	--disable-projectm \

-- 
VLC media player packaging