[SCM] x264 packaging branch, ubuntu, updated. debian/0.85.1442.1+git781d30-1-12-g15df13c

[lool at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 22ff3f85410c7e2e68d5faa525871d0ffbed0e12
Author: Loïc Minier <lool at dooz.org>
Date:   Sun Feb 21 12:35:21 2010 +0100

    Drop binary-common to avoid submakes in rules

diff --git a/debian/rules b/debian/rules
index 21ac920..6c77d47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,27 +56,25 @@ install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	dh_install --fail-missing --sourcedir=debian/tmp
 
-binary-common:
+binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installman debian/x264.1
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installchangelogs -s
+	dh_installdocs -s
+	dh_installexamples -s
+	dh_installman -s debian/x264.1
+	dh_link -s
+	dh_strip -s
+	dh_compress -s
+	dh_fixperms -s
+	dh_makeshlibs -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 binary-indep: build install
-binary-arch: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install

-- 
x264 packaging