[SCM] vlc/master: Use the same names as configure options

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3af1d9cfd6abba8008111c2aa2f691335c6f388c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Apr 12 21:43:19 2016 +0200

    Use the same names as configure options

diff --git a/debian/rules b/debian/rules
index 9a8de77..a7f2dde 100755
--- a/debian/rules
+++ b/debian/rules
@@ -152,16 +152,16 @@ confflags += \
 	$(NULL)
 removeplugins += \
 	alsa \
-	libatmo \
-	libdc1394 \
-	libdtv \
-	libdvb \
-	libdv1394 \
-	libfb \
-	libomxil \
+	atmo \
+	dc1394 \
+	dtv \
+	dv1394 \
+	dvb \
+	fb \
 	linsys \
-	libudev \
-	libv4l2 \
+	omxil \
+	udev \
+	v4l2 \
 	$(NULL)
 endif
 
@@ -171,7 +171,7 @@ confflags += --enable-libva --enable-vcd --enable-smbclient
 pluginpackages += samba
 else
 confflags += --disable-libva --disable-vcd --disable-smbclient
-removeplugins += cdda libvaapi smbclient vcd
+removeplugins += cdda libva smbclient vcd
 endif
 
 # kFreeBSD specific flags
@@ -189,7 +189,7 @@ ifeq (,$(filter-out amd64 i386,$(DEB_HOST_ARCH)))
 confflags += --enable-crystalhd
 else
 confflags += --disable-crystalhd
-removeplugins += libcrystalhd
+removeplugins += crystalhd
 endif
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index ba5c4de..1b9adf2 100755
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -15,10 +15,10 @@ usr/lib/vlc/plugins/access/libaccess_realrtsp_plugin.so
 usr/lib/vlc/plugins/access/libattachment_plugin.so
 usr/lib/vlc/plugins/access/libavio_plugin.so
 usr/lib/vlc/plugins/access/libcdda_plugin.so [cdda]
-usr/lib/vlc/plugins/access/libdc1394_plugin.so [libdc1394]
-usr/lib/vlc/plugins/access/libdtv_plugin.so [libdtv]
-usr/lib/vlc/plugins/access/libdv1394_plugin.so [libdv1394]
-usr/lib/vlc/plugins/access/libdvb_plugin.so [libdvb]
+usr/lib/vlc/plugins/access/libdc1394_plugin.so [dc1394]
+usr/lib/vlc/plugins/access/libdtv_plugin.so [dtv]
+usr/lib/vlc/plugins/access/libdv1394_plugin.so [dv1394]
+usr/lib/vlc/plugins/access/libdvb_plugin.so [dvb]
 usr/lib/vlc/plugins/access/libdvdnav_plugin.so
 usr/lib/vlc/plugins/access/libdvdread_plugin.so
 usr/lib/vlc/plugins/access/libfilesystem_plugin.so
@@ -38,7 +38,7 @@ usr/lib/vlc/plugins/access/libshm_plugin.so
 usr/lib/vlc/plugins/access/libtcp_plugin.so
 usr/lib/vlc/plugins/access/libtimecode_plugin.so
 usr/lib/vlc/plugins/access/libudp_plugin.so
-usr/lib/vlc/plugins/access/libv4l2_plugin.so [libv4l2]
+usr/lib/vlc/plugins/access/libv4l2_plugin.so [v4l2]
 usr/lib/vlc/plugins/access/libvcd_plugin.so [vcd]
 usr/lib/vlc/plugins/access/libvcdx_plugin.so
 usr/lib/vlc/plugins/access/libvdr_plugin.so
@@ -60,7 +60,7 @@ usr/lib/vlc/plugins/codec/libaraw_plugin.so
 usr/lib/vlc/plugins/codec/libavcodec_plugin.so
 usr/lib/vlc/plugins/codec/libcc_plugin.so
 usr/lib/vlc/plugins/codec/libcdg_plugin.so
-usr/lib/vlc/plugins/codec/libcrystalhd_plugin.so [libcrystalhd]
+usr/lib/vlc/plugins/codec/libcrystalhd_plugin.so [crystalhd]
 usr/lib/vlc/plugins/codec/libcvdsub_plugin.so
 usr/lib/vlc/plugins/codec/libddummy_plugin.so
 usr/lib/vlc/plugins/codec/libdts_plugin.so
@@ -76,7 +76,7 @@ usr/lib/vlc/plugins/codec/liblibass_plugin.so
 usr/lib/vlc/plugins/codec/liblibmpeg2_plugin.so
 usr/lib/vlc/plugins/codec/liblpcm_plugin.so
 usr/lib/vlc/plugins/codec/libmpeg_audio_plugin.so
-usr/lib/vlc/plugins/codec/libomxil_plugin.so [libomxil]
+usr/lib/vlc/plugins/codec/libomxil_plugin.so [omxil]
 usr/lib/vlc/plugins/codec/libopus_plugin.so
 usr/lib/vlc/plugins/codec/libpng_plugin.so
 usr/lib/vlc/plugins/codec/librawvideo_plugin.so
@@ -128,7 +128,7 @@ usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
 usr/lib/vlc/plugins/services_discovery/libmtp_plugin.so
 usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.so
 usr/lib/vlc/plugins/services_discovery/libsap_plugin.so
-usr/lib/vlc/plugins/services_discovery/libudev_plugin.so [libudev]
+usr/lib/vlc/plugins/services_discovery/libudev_plugin.so [udev]
 usr/lib/vlc/plugins/services_discovery/libupnp_plugin.so
 usr/lib/vlc/plugins/stream_filter
 usr/lib/vlc/plugins/stream_out
@@ -139,7 +139,7 @@ usr/lib/vlc/plugins/video_filter/libadjust_plugin.so
 usr/lib/vlc/plugins/video_filter/libalphamask_plugin.so
 usr/lib/vlc/plugins/video_filter/libanaglyph_plugin.so
 usr/lib/vlc/plugins/video_filter/libantiflicker_plugin.so
-usr/lib/vlc/plugins/video_filter/libatmo_plugin.so [libatmo]
+usr/lib/vlc/plugins/video_filter/libatmo_plugin.so [atmo]
 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
@@ -185,7 +185,7 @@ usr/lib/vlc/plugins/video_filter/libvhs_plugin.so
 usr/lib/vlc/plugins/video_filter/libwave_plugin.so
 usr/lib/vlc/plugins/video_filter/libyuvp_plugin.so
 usr/lib/vlc/plugins/video_output/libdirectfb_plugin.so
-usr/lib/vlc/plugins/video_output/libfb_plugin.so [libfb]
+usr/lib/vlc/plugins/video_output/libfb_plugin.so [fb]
 usr/lib/vlc/plugins/video_output/libvdummy_plugin.so
 usr/lib/vlc/plugins/video_output/libvmem_plugin.so
 usr/lib/vlc/plugins/video_output/libyuv_plugin.so
diff --git a/debian/vlc.install b/debian/vlc.install
index 4fd3de8..9552e9e 100755
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -10,8 +10,8 @@ usr/lib/vlc/plugins/access/libxcb_screen_plugin.so
 usr/lib/vlc/plugins/audio_output/libpulse_plugin.so
 usr/lib/vlc/plugins/codec/libsdl_image_plugin.so
 usr/lib/vlc/plugins/codec/libsvgdec_plugin.so
-usr/lib/vlc/plugins/codec/libvaapi_drm_plugin.so [vaapi]
-usr/lib/vlc/plugins/codec/libvaapi_x11_plugin.so [vaapi]
+usr/lib/vlc/plugins/codec/libvaapi_drm_plugin.so [libva]
+usr/lib/vlc/plugins/codec/libvaapi_x11_plugin.so [libva]
 usr/lib/vlc/plugins/control/libxcb_hotkeys_plugin.so
 usr/lib/vlc/plugins/gui/libqt4_plugin.so
 usr/lib/vlc/plugins/gui/libskins2_plugin.so

-- 
VLC media player packaging