r12102 - packages/trunk/netrek-client-cow/debian

[Peter Pentchev]

Author: roam-guest
Date: 2011-04-11 11:05:15 +0000 (Mon, 11 Apr 2011)
New Revision: 12102

Modified:
   packages/trunk/netrek-client-cow/debian/changelog
   packages/trunk/netrek-client-cow/debian/control
   packages/trunk/netrek-client-cow/debian/rules
Log:
Minimize the rules file using debhelper overrides.

Modified: packages/trunk/netrek-client-cow/debian/changelog
===================================================================
--- packages/trunk/netrek-client-cow/debian/changelog	2011-04-11 11:04:51 UTC (rev 12101)
+++ packages/trunk/netrek-client-cow/debian/changelog	2011-04-11 11:05:15 UTC (rev 12102)
@@ -22,7 +22,7 @@
   * Let the build system honor CPPFLAGS, CFLAGS and LDFLAGS
     - export them in the rules file
     - add the 004-honor-flags patch
-  * Shorten the rules file using debhelper's dh(1) tool.
+  * Minimize the rules file using debhelper override targets.
 
  -- Peter Pentchev <roam at ringlet.net>  Fri, 08 Apr 2011 16:06:48 +0300
 

Modified: packages/trunk/netrek-client-cow/debian/control
===================================================================
--- packages/trunk/netrek-client-cow/debian/control	2011-04-11 11:04:51 UTC (rev 12101)
+++ packages/trunk/netrek-client-cow/debian/control	2011-04-11 11:05:15 UTC (rev 12102)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libgmp3-dev, libxt-dev, libxxf86vm-dev, libimlib2-dev
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libgmp3-dev, libxt-dev, libxxf86vm-dev, libimlib2-dev
 Standards-Version: 3.9.2
 Homepage: http://www.netrek.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/netrek-client-cow/

Modified: packages/trunk/netrek-client-cow/debian/rules
===================================================================
--- packages/trunk/netrek-client-cow/debian/rules	2011-04-11 11:04:51 UTC (rev 12101)
+++ packages/trunk/netrek-client-cow/debian/rules	2011-04-11 11:05:15 UTC (rev 12102)
@@ -8,10 +8,7 @@
 
 export CPPFLAGS CFLAGS LDFLAGS
 
-build: build-stamp
-
-build-stamp:
-	dh build --before auto_configure
+override_dh_auto_configure:
 	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -22,26 +19,12 @@
 	dh_auto_configure -- \
 		--bindir=\$${prefix}/games \
 		--datadir=\$${prefix}/share/games
-	dh build --before dh_auto_test
-	dh build --after dh_auto_test
-	touch $@
 
-clean: 
-	dh $@
+override_dh_auto_test:
 
-install: build
-	dh $@ --before auto_install
+override_dh_auto_install:
 	dh_auto_install -- prefix=/usr
 	chmod -x $(CURDIR)/debian/netrek-client-cow/usr/share/games/netrek-client-cow/key.cow.linux
-	dh $@ --remaining
 
-# 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 install