[SCM] VLC media player packaging branch, sid, updated. debian/1.1.1-1-10-g47ca0f8

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

The following commit has been merged in the sid branch:
commit feb127b7491f3817e25e862b6975c5c82ad7b1df
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Fri Jul 30 19:42:42 2010 +0200

    Re-enable the modplug module and require the fixed version
    
    Revert "Disable modplug as libmodplug module in sid is buggy"
    
    This reverts commit 0d668bcc42e09e1927b62a0639cf0eafc340abdb.
    
    Closes: #589890, #590787
    
    Conflicts:
    
    	debian/rules

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

-- 
VLC media player packaging