[SCM] liblivemedia/master: Switch to short format debhelper 9.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a4ea0e9fb59b1d90e8c80f124841c2a818f3b5b4
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Dec 15 12:00:25 2012 +0100

    Switch to short format debhelper 9.

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 94b1271..7b5dbff 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>,
            Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Christophe Mutricy <xtophe at videolan.org>
-Build-Depends: debhelper (>= 5.0)
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.4
 Homepage: http://www.live555.com/liveMedia/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/liblivemedia.git
diff --git a/debian/rules b/debian/rules
index f028f07..2f0fb36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f 
+#!/usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -21,18 +21,18 @@ endif
 debian/upstream.changelog:
 	wget http://live555.com/liveMedia/public/changelog.txt -O $@
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
+%:
+	dh $@
+
+override_dh_auto_clean:
+	[ ! -f Makefile ] || $(MAKE) clean
+	rm -f `find . -name '*.a'`
+	rm -f `find . -name Makefile`
+
+override_dh_auto_configure:
 	./genMakefiles linux
-	touch configure-stamp
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	cp debian/upstream.changelog changelog.txt
+override_dh_auto_build:
 	for f in BasicUsageEnvironment \
 	            UsageEnvironment liveMedia groupsock; do \
 	  LDFLAGS="$(LDFLAGS)" \
@@ -41,23 +41,8 @@ build-stamp: configure-stamp
 	done
 	$(MAKE) clean
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE)
-	touch build-stamp
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f changelog.txt
-	rm -f build-stamp configure-stamp
-	[ ! -f Makefile ] || $(MAKE) clean
-	rm -f `find . -name '*.a'`
-	rm -f `find . -name Makefile`
-	dh_clean -XliveMedia/#RTSPClient.cpp#
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+override_dh_install:
 	for f in BasicUsageEnvironment \
 	            UsageEnvironment liveMedia groupsock; do \
 	  dh_install -pliblivemedia-dev "$${f}/include/"*.h* "usr/include/$${f}"; \
@@ -81,24 +66,7 @@ install: build
 	done
 	dh_install -plivemedia-utils debian/openRTSP.html usr/share/doc/livemedia-utils
 
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs changelog.txt
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+override_dh_installchangelogs:
+	dh_installchangelogs debian/upstream.changelog
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install debian/upstream.changelog
+.PHONY: debian/upstream.changelog

-- 
liblivemedia packaging