[SCM] libav/master: Do not accidentally overwrite installed binaries from different flavors

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f8ff91f36d748988a5aab499bef0eeef63fa40da
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Oct 10 08:16:18 2013 -0400

    Do not accidentally overwrite installed binaries from different flavors
    
    Thanks: Fabian Greffrath
    Closes: #725956

diff --git a/debian/rules b/debian/rules
index 6b554ba..346facd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -159,7 +159,7 @@ install-common: build $(DH_INSTALL_FILES)
 	mkdir -p debian/tmp/etc
 	install -m 644 -D doc/avserver.conf debian/tmp/etc/
 	install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
-	dh_install -a $(addprefix -N,$(LIB_EXTRA_PKGS)) \
+	dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) \
 		 --fail-missing --sourcedir=debian/tmp
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	debian/tmp/usr/bin/avconv -formats | tee formats-$(DEB_HOST_ARCH).txt
@@ -171,7 +171,7 @@ install-extra: build $(DH_INSTALL_FILES)
 	dh_testdir
 	dh_testroot
 	$(foreach flavor,$(filter-out static,$(FLAVORS)),$(call install_flavor_extra,$(flavor)))
-	dh_install -a $(addprefix -p,$(LIB_EXTRA_PKGS)) --fail-missing \
+	dh_install $(addprefix -p,$(LIB_EXTRA_PKGS)) --fail-missing \
 		--sourcedir=debian/tmp/extra
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	debian/tmp/usr/bin/avconv -codecs | tee codecs.txt

-- 
Libav/FFmpeg packaging