[SCM] vlc/master: avoid installing plugins twice to avoid file conflicts

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b4e452a3aa3a9de2119cc50141b8433613f985e2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Aug 17 22:38:03 2014 -0400

    avoid installing plugins twice to avoid file conflicts

diff --git a/debian/vlc-nox.install.in b/debian/vlc-nox.install.in
index 9ad436f..d6a7760 100644
--- a/debian/vlc-nox.install.in
+++ b/debian/vlc-nox.install.in
@@ -6,7 +6,6 @@ usr/bin/vlc-wrapper
 usr/lib/vlc/lua/
 usr/lib/vlc/plugins/access/libaccess_alsa_plugin.so
 usr/lib/vlc/plugins/access/libaccess_bd_plugin.so
-usr/lib/vlc/plugins/access/libaccess_jack_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
@@ -29,7 +28,6 @@ usr/lib/vlc/plugins/access/liblibbluray_plugin.so
 usr/lib/vlc/plugins/access/liblinsys_hdsdi_plugin.so
 usr/lib/vlc/plugins/access/liblinsys_sdi_plugin.so
 usr/lib/vlc/plugins/access/liblive555_plugin.so
-usr/lib/vlc/plugins/access/libpulsesrc_plugin.so
 usr/lib/vlc/plugins/access/librar_plugin.so
 usr/lib/vlc/plugins/access/librdp_plugin.so
 usr/lib/vlc/plugins/access/librtp_plugin.so

-- 
VLC media player packaging