[SCM] x265/master: Merge static libraries after cmake is done with them

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 78582ae2a2cd93e723ad45d1210b839d1417fb5f
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Nov 8 14:36:40 2015 +0100

    Merge static libraries after cmake is done with them

diff --git a/debian/rules b/debian/rules
index 951689d..70c1124 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,19 +48,20 @@ override_dh_auto_build-arch:
 	mv x265-10bit/libx265.a x265-10bit/libx265_main10.a
 	mv x265-12bit/libx265.a x265-12bit/libx265_main12.a
 	dh_auto_build
-	mv x265-8bit/libx265.a x265-8bit/lib264_main.a
+
+override_dh_auto_build-indep:
+	$(MAKE) -C doc/reST html
+
+override_dh_auto_install-arch:
+	dh_auto_install
 	ar -M <<EOF \
-		CREATE x265-8bit/libx265.a \
-		ADDLIB x265-8bit/libx265_main.a \
+		CREATE debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libx265.a \
 		ADDLIB x265-10bit/libx265_main10.a \
 		ADDLIB x265-12bit/libx265_main12.a \
 		SAVE \
 		END \
 EOF
 
-override_dh_auto_build-indep:
-	$(MAKE) -C doc/reST html
-
 override_dh_installdocs-indep:
 	dh_installdocs
 	dh_sphinxdoc

-- 
x265 packaging