[SCM] vlc/master: Remove the libvaapi plugin from vlc if libva is disabled.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2daf4bb5307ee29cc59d45a7ebee085ed206d2c1
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Oct 29 01:29:43 2013 +0100

    Remove the libvaapi plugin from vlc if libva is disabled.

diff --git a/debian/rules b/debian/rules
index 7453098..a010ccf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -167,6 +167,7 @@ removeplugins += \
 	libomxil \
 	linsys \
 	libudev \
+	libvaapi \
 	$(NULL)
 endif
 
@@ -229,7 +230,7 @@ override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
 override_dh_auto_clean:
-	[ ! -f debian/vlc-nox.install.bak ] || mv -f debian/vlc-nox.install.bak debian/vlc-nox.install
+	rm -f debian/vlc.install debian/vlc-nox.install
 	dh_auto_clean
 
 override_dh_auto_configure:
@@ -251,8 +252,8 @@ endif
 
 override_dh_install:
 	# Remove disabled plugins
-	test -f debian/vlc-nox.install.bak || cp debian/vlc-nox.install debian/vlc-nox.install.bak
-	sed -i "/\($(shell echo $(removeplugins) | sed 's/ /\\|/g')\)_/d" debian/vlc-nox.install
+	sed "/\($(shell echo $(removeplugins) | sed 's/ /\\|/g')\)_/d" debian/vlc.install.in > debian/vlc.install
+	sed "/\($(shell echo $(removeplugins) | sed 's/ /\\|/g')\)_/d" debian/vlc-nox.install.in > debian/vlc-nox.install
 	# Clean up libtool crap
 	find debian/tmp -name '*.la' -delete
 	# Remove useless stuff
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install.in
similarity index 100%
rename from debian/vlc-nox.install
rename to debian/vlc-nox.install.in
diff --git a/debian/vlc.install b/debian/vlc.install.in
similarity index 100%
rename from debian/vlc.install
rename to debian/vlc.install.in

-- 
VLC media player packaging