r10679 - packages/trunk/nettoe/debian

[Mats Erik Andersson]

Author: meand-guest
Date: 2010-01-10 18:50:30 +0000 (Sun, 10 Jan 2010)
New Revision: 10679

Modified:
   packages/trunk/nettoe/debian/changelog
   packages/trunk/nettoe/debian/rules
Log:
Simplify some debian targets to use 'dh $@'.


Modified: packages/trunk/nettoe/debian/changelog
===================================================================
--- packages/trunk/nettoe/debian/changelog	2010-01-10 17:53:54 UTC (rev 10678)
+++ packages/trunk/nettoe/debian/changelog	2010-01-10 18:50:30 UTC (rev 10679)
@@ -10,11 +10,12 @@
     + Short description: use an initial small case letter.
     + Add ${misc:Depends} to binary package section Depends.
   * Set the suite to UNRELEASED.
+  * debian/rules: Simplify some targets to use 'dh $@'.
 
   [ Barry deFreese ]
   * Update my e-mail addresses.
 
- -- Mats Erik Andersson <mats.andersson at gisladisker.se>  Sun, 10 Jan 2010 18:47:14 +0100
+ -- Mats Erik Andersson <mats.andersson at gisladisker.se>  Sun, 10 Jan 2010 19:46:00 +0100
 
 nettoe (1.1.0-4) UNRELEASED; urgency=low
 

Modified: packages/trunk/nettoe/debian/rules
===================================================================
--- packages/trunk/nettoe/debian/rules	2010-01-10 17:53:54 UTC (rev 10678)
+++ packages/trunk/nettoe/debian/rules	2010-01-10 18:50:30 UTC (rev 10679)
@@ -1,50 +1,31 @@
 #!/usr/bin/make -f
 
-# `-Wall' is added by configure.
-export CFLAGS := -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-
 build: build-stamp
 build-stamp:
 	dh_testdir
-
 	./configure --prefix=/usr --bindir=/usr/games --mandir=/usr/share/man
 	$(MAKE)
+	touch $@
 
-	touch build-stamp
-
 clean:
-	dh_testdir
-	dh_testroot
+	dh $@
 
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
+install: install-stamp
+install-stamp: build
 	dh_testdir
 	dh_testroot
 	dh_prep
 	dh_installdirs
-
 	$(MAKE) DESTDIR=$(CURDIR)/debian/nettoe install
+	touch $@
 
-binary-indep: build install
+binary-indep: install
+	dh $@
 
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installmenu
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+binary-arch: install
+	dh $@
 
 binary: binary-indep binary-arch
+	dh $@
+
 .PHONY: build clean binary-indep binary-arch binary install