[SCM] x264/master: Convert packaging to dh 8.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fbe2ae042c21f55ba2c7bf380c8a6e525287b3a9
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 4 21:03:30 2011 -0400

    Convert packaging to dh 8.

diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 77fd58a..d2b36e8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Reinhard Tartler <siretart at tauware.de>,
            Fabian Greffrath <fabian+debian at greffrath.com>,
            Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 8),
                libavformat-dev (>= 4:0.5),
                help2man,
                yasm [i386 amd64 kfreebsd-amd64 lpia],
diff --git a/debian/rules b/debian/rules
index 735596b..96d7715 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,17 +6,14 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_GNU_CPU    ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 
-DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-PARALLEL_FLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL))
-# will affect concurrency of debian/rules as well
-MAKEFLAGS += $(PARALLEL_FLAGS)
-
 include debian/confflags
 
 LDFLAGS += -Wl,--as-needed
 
-build:
-	dh_testdir
+%:
+	dh $@ --parallel
+
+override_dh_auto_build:
 	# Build static lib
 	LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags)
 	$(MAKE)
@@ -33,49 +30,23 @@ ifeq ($(do_opt),yes)
 	$(MAKE)
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/install/opt
 endif
-	touch $@
-
-debian/x264.1:
 	help2man -n"fast h264 encoder" -N -s1 -S "Videolan project" -h '--fullhelp' \
-		debian/install/static/usr/bin/x264 > $@
+		debian/install/static/usr/bin/x264 > debian/x264.1
+
+override_dh_auto_configure:
+	# dh_auto_configure phase handled via dh_auto_build.
 
-clean:
-	dh_testdir
-	dh_testroot
+override_dh_auto_install:
+	# dh_auto_install phase handled via dh_auto_build.
+
+override_dh_clean:
 	rm -rf debian/install
 	$(MAKE) -o config.mak distclean
-	dh_clean build debian/x264.1 config.mak2
+	dh_clean debian/x264.1 config.mak2
 
-install:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+override_dh_install:
 	dh_install --list-missing --sourcedir=debian/install
 ifeq ($(do_opt),yes)
 	mkdir -p debian/$(libx264N)$(opt_libdir)
 	cp -a debian/install/opt$(opt_libdir)/*.so.* debian/$(libx264N)$(opt_libdir)
 endif
-
-binary-arch: build install debian/x264.1
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -s
-	dh_installdocs -s
-	dh_installexamples -s
-	dh_installman -s
-	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: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install

-- 
x264 packaging