[SCM] x265/master: Do not configure, test and install arch bits when building indep

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5e95e6c81e8a2655141da430fe1f5ddcee5fc823
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Dec 2 13:41:43 2015 +0100

    Do not configure, test and install arch bits when building indep
    
    Closes: #806877

diff --git a/debian/rules b/debian/rules
index 70c1124..38f3d14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,9 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf doc/reST/build
 
-override_dh_auto_configure:
+# -arch bits
+
+override_dh_auto_configure-arch:
 	dh_auto_configure --builddirectory=x265-10bit -- \
 		-DENABLE_PIC=ON \
 		-DENABLE_CLI=OFF \
@@ -49,9 +51,6 @@ override_dh_auto_build-arch:
 	mv x265-12bit/libx265.a x265-12bit/libx265_main12.a
 	dh_auto_build
 
-override_dh_auto_build-indep:
-	$(MAKE) -C doc/reST html
-
 override_dh_auto_install-arch:
 	dh_auto_install
 	ar -M <<EOF \
@@ -62,10 +61,20 @@ override_dh_auto_install-arch:
 		END \
 EOF
 
+# -indep bits
+
+# no configure, test and install for indep
+override_dh_auto_configure-indep override_dh_auto_test-indep override_dh_auto_install-indep:
+
+override_dh_auto_build-indep:
+	$(MAKE) -C doc/reST html
+
 override_dh_installdocs-indep:
 	dh_installdocs
 	dh_sphinxdoc
 
+# common bits
+
 override_dh_strip:
 	dh_strip -plibx265-68 --dbg-package=libx265-68-dbg
 	dh_strip --remaining-packages

-- 
x265 packaging