r9341 - packages/trunk/xmahjongg/debian

[Peter Pentchev]

Author: roam-guest
Date: 2009-03-31 23:31:46 +0000 (Tue, 31 Mar 2009)
New Revision: 9341

Modified:
   packages/trunk/xmahjongg/debian/changelog
   packages/trunk/xmahjongg/debian/control
   packages/trunk/xmahjongg/debian/rules
Log:
Minimize the rules file by using debhelper's override targets.

This is intentionally done as a separate commit to allow easier backporting
to lenny.


Modified: packages/trunk/xmahjongg/debian/changelog
===================================================================
--- packages/trunk/xmahjongg/debian/changelog	2009-03-31 23:18:39 UTC (rev 9340)
+++ packages/trunk/xmahjongg/debian/changelog	2009-03-31 23:31:46 UTC (rev 9341)
@@ -15,7 +15,7 @@
   * Use dh_installman instead of the deprecated dh_installmanpages.
   * Bump Standards-Version to 3.8.1:
     - add the README.source file mentioning the use of quilt
-  * Shorten the rules file using debhelper 7's dh helper.
+  * Minimize the rules file using debhelper override targets.
 
  -- Peter Pentchev <roam at ringlet.net>  Tue, 31 Mar 2009 17:19:37 +0300
 

Modified: packages/trunk/xmahjongg/debian/control
===================================================================
--- packages/trunk/xmahjongg/debian/control	2009-03-31 23:18:39 UTC (rev 9340)
+++ packages/trunk/xmahjongg/debian/control	2009-03-31 23:31:46 UTC (rev 9341)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter Pentchev <roam at ringlet.net>
 Standards-Version: 3.8.1
-Build-Depends: debhelper (>= 7), libx11-dev, x11proto-core-dev, quilt
+Build-Depends: debhelper (>= 7.0.50), libx11-dev, x11proto-core-dev, quilt
 Homepage: http://www.lcdf.org/xmahjongg/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/xmahjongg
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/xmahjongg/?op=log

Modified: packages/trunk/xmahjongg/debian/rules
===================================================================
--- packages/trunk/xmahjongg/debian/rules	2009-03-31 23:18:39 UTC (rev 9340)
+++ packages/trunk/xmahjongg/debian/rules	2009-03-31 23:31:46 UTC (rev 9341)
@@ -11,35 +11,17 @@
 
 include /usr/share/quilt/quilt.make
 
-build: build-stamp
-build-stamp:	${QUILT_STAMPFN}
-	dh build --before auto_configure
+override_dh_auto_configure:	${QUILT_STAMPFN}
 	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/games
 	# Avoid rebuilding config.h.in
 	touch config.h.in
-	dh build --after auto_configure
-	touch build-stamp
 
-clean:
-	dh $@ --before auto_clean
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh $@ --after auto_clean
+override_dh_auto_clean:
+	dh_auto_clean
 	${MAKE} -f debian/rules unpatch
 
-install: install-stamp
-install-stamp: build-stamp
-	dh install --before auto_install
+override_dh_auto_install:
 	$(MAKE) install prefix=$D/usr bindir=$D/usr/games mandir=$D/usr/share/man datadir=$D/usr/share/games
-	dh install --after auto_install
-	touch install-stamp
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
+%:
 	dh $@
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary