[merkaartor] 04/04: Use minimal dh rules.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository merkaartor.

commit 7a126bf1fe5d6adc4ac34d6bde79dcf41e9f1e91
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 22 21:54:31 2015 +0200

    Use minimal dh rules.
---
 debian/changelog |  1 +
 debian/rules     | 64 ++++++++++++++++++--------------------------------------
 2 files changed, 21 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce6c21d..3d5dc64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ merkaartor (0.18.1-4) UNRELEASED; urgency=medium
     - Update watch file for move to GitHub.
     - Update Homepage URL to www.merkaartor.be.
   * Switch to source format 3.0 (quilt).
+  * Use minimal dh rules.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 22 Aug 2015 21:39:31 +0200
 
diff --git a/debian/rules b/debian/rules
index 2bc09bb..ac8fe1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
 DISTRIBUTION = $(shell dpkg-parsechangelog | grep '^Distribution:')
 ifneq (,$(findstring experimental,$(DISTRIBUTION)))
 RELEASEFLAGS = NODEBUG=0 RELEASE=0
@@ -21,9 +24,18 @@ else
 	CFLAGS += -O2
 endif
 
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-	dh_testdir
+%:
+	dh $@ --parallel
+
+override_dh_auto_clean:
+	dh_auto_clean
+	cd translations && make clean
+
+override_dh_clean:
+	dh_clean merkaartor.png src/revision.h
+	rm -rf binaries
+
+override_dh_auto_configure:
 	echo '#define SVNREV $(SVNREV)' > src/revision.h
 	cd translations && make release
 	qmake-qt4 Merkaartor.pro NOWEBKIT=1 \
@@ -37,31 +49,13 @@ configure-stamp: $(QUILT_STAMPFN)
 			SPATIALITE=1 \
 			LIBPROXY=1 \
 			$(RELEASEFLAGS)
-	touch configure-stamp
 
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
+override_dh_auto_build:
 	$(MAKE)
 	uudecode debian/merkaartor.png.b64
 	touch $@
 
-clean: clean-patched
-clean-patched: 
-	dh_testdir
-	dh_testroot
-	dh_clean
-	rm -f build-stamp configure-stamp
-	 cd translations && make clean
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f merkaartor.png
-	rm -rf binaries
-	rm -f src/revision.h
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
+override_dh_auto_install:
 	make install INSTALL_ROOT=$(CURDIR)/debian/merkaartor
 	install -d $(CURDIR)/debian/merkaartor/usr/share/pixmaps
 	install -D -m644 $(CURDIR)/Icons/Merkaartor.xpm \
@@ -71,27 +65,9 @@ install: build
 	install -D -m644 $(CURDIR)/src/merkaartor.desktop \
 			 $(CURDIR)/debian/merkaartor/usr/share/applications/merkaartor.desktop
 
-
-binary-indep:
-	#nothing to do.
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
+override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG
-	dh_installdocs
-	dh_installmenu
-	dh_installman debian/merkaartor.1
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch binary-indep
 
-.PHONY: build clean binary-indep binary-arch binary binary-indep install configure get-orig-source
+override_dh_installman:
+	dh_installman debian/merkaartor.1
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git