[SCM] vlc/master: Add libfbosd plugin to vlc-nox on Linux.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1ab01a9f0cbd2be8f4d101fc5c05903ab933cd1f
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Jun 30 18:23:48 2012 +0200

    Add libfbosd plugin to vlc-nox on Linux.

diff --git a/debian/rules b/debian/rules
index e3e20fb..c88f225 100755
--- a/debian/rules
+++ b/debian/rules
@@ -124,6 +124,7 @@ confflags += \
 	--enable-atmo \
 	--enable-dc1394 \
 	--enable-dv \
+	--enable-fbosd \
 	--enable-libva \
 	--enable-linsys \
 	--enable-omxil \
@@ -136,13 +137,26 @@ confflags += \
 	--disable-atmo \
 	--disable-dc1394 \
 	--disable-dv \
+	--disable-fbosd \
 	--disable-libva \
 	--disable-linsys \
 	--disable-omxil \
 	--disable-pvr \
 	--disable-udev \
 	$(NULL)
-removeplugins += alsa libatmo libdc1394 libdtv libaccess_dv libfb libomxil linsys libpvr libudev
+removeplugins += \
+	alsa \
+	libatmo \
+	libdc1394 \
+	libdtv \
+	libaccess_dv \
+	libfb \
+	libfbosd \
+	libomxil \
+	linsys \
+	libpvr \
+	libudev \
+	$(NULL)
 endif
 
 # Linux and kFreeBSD specific flags
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index ed1c942..7d6f635 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -98,6 +98,7 @@ usr/lib/vlc/plugins/control/libmotion_plugin.so
 usr/lib/vlc/plugins/control/libnetsync_plugin.so
 usr/lib/vlc/plugins/control/liboldrc_plugin.so
 usr/lib/vlc/plugins/demux
+usr/lib/vlc/plugins/gui/libfbosd_plugin.so
 usr/lib/vlc/plugins/gui/libncurses_plugin.so
 usr/lib/vlc/plugins/lua/liblua_plugin.so
 usr/lib/vlc/plugins/meta_engine

-- 
VLC media player packaging