[SCM] ffmpeg/master: Call dh_auto_install with -a/-i for -arch and for -indep targets respectively

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1136f2fe55e8d86b12262d5e0f88b7e887f14696
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Tue Nov 1 14:48:31 2016 +0100

    Call dh_auto_install with -a/-i for -arch and for -indep targets respectively

diff --git a/debian/rules b/debian/rules
index c69cfbc..e9f90ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -242,12 +242,12 @@ override_dh_auto_test-arch:
 override_dh_auto_test-indep:
 
 override_dh_auto_install-arch:
-	dh_auto_install --sourcedirectory=debian/standard
+	dh_auto_install -a --sourcedirectory=debian/standard
 ifeq ($(DEB_HOST_ARCH),powerpc)
 	install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
 	install -m 644 debian/altivec/*/*.so.* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
 endif
-	dh_auto_install --sourcedirectory=debian/extra --destdir=debian/tmp/extra
+	dh_auto_install -a --sourcedirectory=debian/extra --destdir=debian/tmp/extra
 ifeq ($(DEB_HOST_ARCH),powerpc)
 	install -d debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
 	install -m 644 debian/altivec-extra/*/*.so.* debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
@@ -256,7 +256,7 @@ endif
 	install -m 644 debian/static/*/lib*.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_install-indep:
-	dh_auto_install --sourcedirectory=debian/standard
+	dh_auto_install -i --sourcedirectory=debian/standard
 
 override_dh_install:
 	dh_install $(addprefix -p,$(EXTRA_PKGS)) --sourcedir=debian/tmp/extra

-- 
ffmpeg packaging