[SCM] vlc/master: Install all control plugins in vlc-nox

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fab7def2e2d4353715a756067a538bc9912e3573
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 16 19:46:50 2014 -0400

    Install all control plugins in vlc-nox
    
    libglobalplugins is was dropped upstream

diff --git a/debian/vlc-nox.install.in b/debian/vlc-nox.install.in
index 85afdb7..2158d16 100644
--- a/debian/vlc-nox.install.in
+++ b/debian/vlc-nox.install.in
@@ -96,14 +96,7 @@ usr/lib/vlc/plugins/codec/libuleaddvaudio_plugin.so
 usr/lib/vlc/plugins/codec/libvorbis_plugin.so
 usr/lib/vlc/plugins/codec/libx264_plugin.so
 usr/lib/vlc/plugins/codec/libxwd_plugin.so
-usr/lib/vlc/plugins/control/libdbus_plugin.so
-usr/lib/vlc/plugins/control/libdummy_plugin.so
-usr/lib/vlc/plugins/control/libgestures_plugin.so
-usr/lib/vlc/plugins/control/libhotkeys_plugin.so
-usr/lib/vlc/plugins/control/liblirc_plugin.so
-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/control
 usr/lib/vlc/plugins/demux
 usr/lib/vlc/plugins/gui/libncurses_plugin.so
 usr/lib/vlc/plugins/lua/liblua_plugin.so
diff --git a/debian/vlc.install.in b/debian/vlc.install.in
index 4309e50..0e62acc 100644
--- a/debian/vlc.install.in
+++ b/debian/vlc.install.in
@@ -4,7 +4,6 @@ usr/lib/vlc/plugins/access/libxcb_screen_plugin.so
 usr/lib/vlc/plugins/codec/libsdl_image_plugin.so
 usr/lib/vlc/plugins/codec/libvaapi_*_plugin.so
 usr/lib/vlc/plugins/vdpau/
-usr/lib/vlc/plugins/control/libglobalhotkeys_plugin.so
 usr/lib/vlc/plugins/gui/libqt4_plugin.so
 usr/lib/vlc/plugins/gui/libskins2_plugin.so
 usr/lib/vlc/plugins/misc/libxdg_screensaver_plugin.so

-- 
VLC media player packaging