r11857 - packages/trunk/alex4/debian

[Peter Pentchev]

Author: roam-guest
Date: 2011-03-09 20:03:14 +0000 (Wed, 09 Mar 2011)
New Revision: 11857

Added:
   packages/trunk/alex4/debian/alex4.manpages
Modified:
   packages/trunk/alex4/debian/changelog
   packages/trunk/alex4/debian/rules
Log:
Shorten the rules file using the dh(1) tool.

Added: packages/trunk/alex4/debian/alex4.manpages
===================================================================
--- packages/trunk/alex4/debian/alex4.manpages	                        (rev 0)
+++ packages/trunk/alex4/debian/alex4.manpages	2011-03-09 20:03:14 UTC (rev 11857)
@@ -0,0 +1 @@
+debian/alex4.6

Modified: packages/trunk/alex4/debian/changelog
===================================================================
--- packages/trunk/alex4/debian/changelog	2011-03-09 20:02:40 UTC (rev 11856)
+++ packages/trunk/alex4/debian/changelog	2011-03-09 20:03:14 UTC (rev 11857)
@@ -13,9 +13,8 @@
   * Convert to the 3.0 (quilt) source format.
   * Add misc:Depends to the alex4-data package just in case.
   * Expand the alex4-data package's long description.
-  * Bump the debhelper compatibility level to 7:
-    - let dh_clean remove the *-stamp files
-    - use dh_prep instead of dh_clean -k
+  * Bump the debhelper compatibility level to 7 and shorten the rules file
+    using the dh(1) tool.
 
  -- Peter Pentchev <roam at ringlet.net>  Wed, 09 Mar 2011 14:14:04 +0200
 

Modified: packages/trunk/alex4/debian/rules
===================================================================
--- packages/trunk/alex4/debian/rules	2011-03-09 20:02:40 UTC (rev 11856)
+++ packages/trunk/alex4/debian/rules	2011-03-09 20:03:14 UTC (rev 11857)
@@ -3,75 +3,32 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 CFLAGS = -Wall -g $(if $(findstring noopt,$(DEB_BUILD_OPTIONS)), -O0, -O2)
 
-
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp:
-	$(MAKE) -C src CFLAGS="$(CFLAGS)" \
-		PREFIX=/usr DATADIR=/usr/share/games/alex4
+build: build-stamp
+build-stamp:
+	dh build --before auto_build
+	dh_auto_build -D src -- CFLAGS="$(CFLAGS)" \
+		DATADIR=/usr/share/games/alex4
+	dh build --remaining
 	touch $@
 
-build-indep:
-# nothing to do here
-
-
 clean:
-	dh_testdir
-	dh_testroot
-	[ ! -f src/Makefile ] || $(MAKE) -C src clean
-	dh_clean
+	dh clean --before auto_clean
+	dh_auto_clean -D src
+	dh clean --remaining
 
+install:	install-stamp
+install-stamp:	build
+	dh install
+	touch install-stamp
 
-install: install-indep install-arch
+binary:	binary-arch binary-indep
 
-install-indep: build-indep
-	dh_testdir
-	dh_testroot
-	dh_prep -i
-	dh_installdirs -i
-	dh_install -i
+binary-arch:	install
+	dh $@
 
-install-arch: build-arch
-	dh_testdir
-	dh_testroot
-	dh_prep -a
-	dh_installdirs -a
-	dh_install -a
+binary-indep:	install
+	dh $@
 
-
-binary: binary-arch binary-indep
-
-binary-indep: build-indep install-indep
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: build-arch install-arch
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_installmenu -a
-	dh_installman -a debian/alex4.6
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
+.PHONY: build clean binary install