r8137 - packages/trunk/hitori/debian

[Peter De Wachter]

Author: pdewacht-guest
Date: 2008-09-14 13:14:01 +0000 (Sun, 14 Sep 2008)
New Revision: 8137

Modified:
   packages/trunk/hitori/debian/rules
Log:
Use explicit dh_* calls instead of dh


Modified: packages/trunk/hitori/debian/rules
===================================================================
--- packages/trunk/hitori/debian/rules	2008-09-14 13:13:29 UTC (rev 8136)
+++ packages/trunk/hitori/debian/rules	2008-09-14 13:14:01 UTC (rev 8137)
@@ -9,35 +9,53 @@
 
 build: patch build-stamp
 build-stamp:
-	dh build --before configure
+	dh_testdir
 	NOCONFIGURE=1 ./autogen.sh
 # The GENERAL flags make configure skip its version check. Remove when we have GTK+ 2.14.
-	dh_auto_configure -- \
+	./configure \
+		--prefix /usr \
 		--bindir /usr/games \
 		--disable-scrollkeeper \
 		GENERAL_CFLAGS="`pkg-config --cflags gtk+-2.0 gmodule-export-2.0 gnome-vfs-2.0`" \
 		GENERAL_LIBS="`pkg-config --libs gtk+-2.0 gmodule-export-2.0 gnome-vfs-2.0`"
-# We skip the "make test" as it complains about quilt's .pc directory
-# (and it doesn't appear to check anything interesting)
-	dh build --before test
-	dh build --after test
+	$(MAKE)
 	touch build-stamp
 
 clean: unpatch
-	dh clean
-# Kill everything that looks generated. A bit paranoid perhaps :)
-	dh_clean configure config.sub config.guess aclocal.m4 libtool ltmain.sh po/Makefile.in.in po/POTFILES \
+	dh_testdir
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean configure config.sub config.guess aclocal.m4 libtool ltmain.sh \
+		po/Makefile.in.in po/POTFILES \
 		{.,src,help,data,data/icons,data/icons/*}/Makefile.in
 
 install: build install-stamp
 install-stamp:
-	dh install --until installchangelogs
-# There are two changelogs!
-	install help/ChangeLog debian/hitori/usr/share/doc/hitori/changelog.help
-	dh install --remaining
+	dh_testdir
+	dh_testroot
+	dh_prep
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/hitori
 	touch install-stamp
 
 binary: install
-	dh binary
+	dh_testdir
+	dh_testroot
+	dh_install
+	dh_installchangelogs ChangeLog
+# There are two changelogs!
+	install help/ChangeLog debian/hitori/usr/share/doc/hitori/changelog.help
+	dh_installdocs
+	dh_installman
+	dh_installmenu
+	dh_desktop
+	dh_icons
+	dh_scrollkeeper
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 .PHONY: build clean install binary