r13826 - packages/trunk/hitori/debian

[Peter De Wachter]

Author: pdewacht-guest
Date: 2012-10-24 22:12:27 +0000 (Wed, 24 Oct 2012)
New Revision: 13826

Modified:
   packages/trunk/hitori/debian/changelog
   packages/trunk/hitori/debian/rules
Log:
hitori: swith to minimalist debian/rules


Modified: packages/trunk/hitori/debian/changelog
===================================================================
--- packages/trunk/hitori/debian/changelog	2012-10-24 21:43:56 UTC (rev 13825)
+++ packages/trunk/hitori/debian/changelog	2012-10-24 22:12:27 UTC (rev 13826)
@@ -1,8 +1,8 @@
 hitori (0.4.0-1) unstable; urgency=low
 
   * New upstream version.
-  * Use dh_autotools-dev to update and restore config.*.
-  * Update debhelper compatiblity level from 7 to 9.
+  * Switch to minimalist debian/rules with debhelper 9.
+    - Use dh_autotools-dev to update and restore config.*.
   * Bumped Standards-Version to 3.9.4. No changes needed.
 
  -- Peter De Wachter <pdewacht at gmail.com>  Wed, 24 Oct 2012 21:57:45 +0200

Modified: packages/trunk/hitori/debian/rules
===================================================================
--- packages/trunk/hitori/debian/rules	2012-10-24 21:43:56 UTC (rev 13825)
+++ packages/trunk/hitori/debian/rules	2012-10-24 22:12:27 UTC (rev 13826)
@@ -1,78 +1,18 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
 
+%:
+	dh $@ --with autotools_dev
 
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--bindir='$${prefix}/games' \
+		--disable-silent-rules
 
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  CROSS = --build $(DEB_HOST_GNU_TYPE)
-else
-  CROSS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	dh_autotools-dev_updateconfig
-	./configure $(CROSS) \
-		--prefix=/usr \
-		--bindir=/usr/games \
-		--disable-silent-rules \
-		$(shell DEB_LDFLAGS_MAINT_APPEND="-Wl,-z,defs -Wl,--as-needed" \
-			dpkg-buildflags --export=configure)
-	touch configure-stamp
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_autotools-dev_restoreconfig
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/hitori
-
-binary: binary-arch binary-indep
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_install
-	dh_installchangelogs ChangeLog
+override_dh_installchangelogs:
 # Take care to install the old changelogs as well...
+	dh_installchangelogs ChangeLog
 	install ChangeLog.pre-0-2-2 debian/hitori/usr/share/doc/hitori/changelog.pre-0-2-2
 	install help/ChangeLog.pre-0-2-2 debian/hitori/usr/share/doc/hitori/changelog.help.pre-0-2-2
 	install po/ChangeLog.pre-0-2-2 debian/hitori/usr/share/doc/hitori/changelog.po.pre-0-2-2
-	dh_installdocs
-	dh_installman
-	dh_installmenu
-	dh_icons
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep:
-# Nothing to do.
-
-
-.PHONY: build clean install binary binary-arch binary-indep