[SCM] VLC media player packaging branch, experimental, updated. debian/1.0.6-1-62-g39042ce

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

The following commit has been merged in the experimental branch:
commit 39042ce025b6a596961eae6839d485efa6b7c407
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jun 24 19:38:17 2010 +0200

    Enable atmo, fluidsynth, kate, and mtp plugin.

diff --git a/debian/control b/debian/control
index b12f45a..0ca6de4 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Build-Depends: debhelper (>= 7.2.3~),
                libdvdread-dev (>= 0.9.5),
                libfaad-dev,
                libflac-dev (>= 1.1.2-3),
+               libfluidsynth-dev,
                libfreetype6-dev,
                libfribidi-dev,
                libggi2-dev,
@@ -36,6 +37,7 @@ Build-Depends: debhelper (>= 7.2.3~),
                libglib2.0-0,
                libgnutls-dev (>= 1.2.8),
                libjack-dev,
+               libkate-dev,
                liblircclient-dev,
                liblivemedia-dev (>= 2009.11.27),
                liblua5.1-0-dev,
@@ -44,6 +46,7 @@ Build-Depends: debhelper (>= 7.2.3~),
                libmodplug-dev,
                libmpcdec-dev,
                libmpeg2-4-dev,
+               libmtp-dev,
                libncursesw5-dev,
                libnotify-dev,
                libogg-dev,
diff --git a/debian/rules b/debian/rules
index 42bb217..0838251 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,17 +42,14 @@ confflags += \
 	$(NULL)
 # configure features
 confflags += \
-	--disable-atmo \
-	--disable-fluidsynth \
 	--disable-gnomevfs \
-	--disable-kate \
-	--disable-mtp \
 	--disable-portaudio \
 	--disable-sqlite \
 	--disable-telx \
 	--disable-x264 \
 	--enable-a52 \
 	--enable-aa \
+	--enable-atmo \
 	--enable-bonjour \
 	--enable-caca \
 	--enable-dca \
@@ -61,11 +58,13 @@ confflags += \
 	--enable-dvdnav \
 	--enable-faad \
 	--enable-flac \
+	--enable-fluidsynth \
 	--enable-freetype \
 	--enable-fribidi \
 	--enable-ggi \
 	--enable-gnutls \
 	--enable-jack \
+	--enable-kate \
 	--enable-libass \
 	--enable-libmpeg2 \
 	--enable-lirc \
@@ -75,6 +74,7 @@ confflags += \
 	--enable-mod \
 	--enable-mozilla \
 	--enable-mpc \
+	--enable-mtp \
 	--enable-ncurses \
 	--enable-notify \
 	--enable-ogg \
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index 81394f5..8bf78c8 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -15,6 +15,7 @@ usr/lib/vlc/plugins/access/libaccess_http_plugin.so
 usr/lib/vlc/plugins/access/libaccess_imem_plugin.so
 usr/lib/vlc/plugins/access/libaccess_mmap_plugin.so
 usr/lib/vlc/plugins/access/libaccess_mms_plugin.so
+usr/lib/vlc/plugins/access/libaccess_mtp_plugin.so
 usr/lib/vlc/plugins/access/libaccess_oss_plugin.so
 usr/lib/vlc/plugins/access/libaccess_realrtsp_plugin.so
 usr/lib/vlc/plugins/access/libaccess_smb_plugin.so
@@ -53,7 +54,9 @@ usr/lib/vlc/plugins/codec/libdvbsub_plugin.so
 usr/lib/vlc/plugins/codec/libfaad_plugin.so
 usr/lib/vlc/plugins/codec/libfake_plugin.so
 usr/lib/vlc/plugins/codec/libflac_plugin.so
+usr/lib/vlc/plugins/codec/libfluidsynth_plugin.so
 usr/lib/vlc/plugins/codec/libinvmem_plugin.so
+usr/lib/vlc/plugins/codec/libkate_plugin.so
 usr/lib/vlc/plugins/codec/liblibass_plugin.so
 usr/lib/vlc/plugins/codec/liblibmpeg2_plugin.so
 usr/lib/vlc/plugins/codec/liblpcm_plugin.so
@@ -105,6 +108,7 @@ usr/lib/vlc/plugins/stream_out
 usr/lib/vlc/plugins/video_chroma
 usr/lib/vlc/plugins/video_filter/libadjust_plugin.so
 usr/lib/vlc/plugins/video_filter/libalphamask_plugin.so
+usr/lib/vlc/plugins/video_filter/libatmo_plugin.so
 usr/lib/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so
 usr/lib/vlc/plugins/video_filter/libball_plugin.so
 usr/lib/vlc/plugins/video_filter/libblend_plugin.so

-- 
VLC media player packaging