[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 ee4ebe111adbe39daa45a016ab1dbd5223dcb4b6
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Thu Jul 22 22:43:38 2010 +0100

    Move xcb_apps SD to vlc

diff --git a/debian/rules b/debian/rules
index 87e68ed..28b28e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -202,7 +202,7 @@ install: build
 	        fi ; \
 	done
 # Remove some modules on non-linux arch
-	sed -e '/\(lib\|libaccess_\)\(alsa\|atmo\|dc1394\|dv\|dvb\|fb\|v4l\|v4l2\|pvr\)_/d' \
+	sed -e '/\(lib\|libaccess_\)\(alsa\|atmo\|dc1394\|dv\|dvb\|fb\|v4l\|v4l2\|pvr\|udev\)_/d' \
 	 debian/vlc-nox.install > debian/vlc-nox.install.kfreebsd
 	sed -e '/\(lib\|libaccess_\)\(probe_hal\)_/d' \
 	 debian/vlc-nox.install.kfreebsd > debian/vlc-nox.install.hurd
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index 3a3b9a6..a05282e 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -101,7 +101,13 @@ usr/lib/vlc/plugins/misc/libxml_plugin.so
 usr/lib/vlc/plugins/misc/libxtag_plugin.so
 usr/lib/vlc/plugins/mux
 usr/lib/vlc/plugins/packetizer
-usr/lib/vlc/plugins/services_discovery
+usr/lib/vlc/plugins/services_discovery/libsap_plugin.so
+usr/lib/vlc/plugins/services_discovery/libmtp_plugin.so
+usr/lib/vlc/plugins/services_discovery/libupnp_intel_plugin.so
+usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.so
+usr/lib/vlc/plugins/services_discovery/libudev_plugin.so
+usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.so
+usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
 usr/lib/vlc/plugins/stream_filter
 usr/lib/vlc/plugins/stream_out
 usr/lib/vlc/plugins/video_chroma
diff --git a/debian/vlc.install b/debian/vlc.install
index 44c0ed9..d7681fa 100644
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -7,6 +7,7 @@ usr/lib/vlc/plugins/gui/libqt4_plugin.so
 usr/lib/vlc/plugins/gui/libskins2_plugin.so
 usr/lib/vlc/plugins/misc/libnotify_plugin.so
 usr/lib/vlc/plugins/misc/libxdg_screensaver_plugin.so
+usr/lib/vlc/plugins/services_discovery/libxcb_apps_plugin.so
 usr/lib/vlc/plugins/video_filter/libpanoramix_plugin.so
 usr/lib/vlc/plugins/video_output/libaa_plugin.so
 usr/lib/vlc/plugins/video_output/libxcb_window_plugin.so

-- 
VLC media player packaging