[grass] 01/02: Fix build with `dpkg-buildpackage -A`.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository grass.

commit 17b58e5bf7dbb8773a4d30dcb0ebd400d39d9ef1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 7 22:44:31 2016 +0100

    Fix build with `dpkg-buildpackage -A`.
    
    Add dependency on override_dh_auto_install-arch target to override_dh_auto_install-indep target.
    The HTML documentation is built along with the code in the build-arch target.
---
 debian/changelog | 10 ++++++++++
 debian/rules     | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ac0846..20868ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+grass (7.0.3~rc1-1~exp2) UNRELEASED; urgency=medium
+
+  * Fix build with `dpkg-buildpackage -A`. Add dependency on
+    override_dh_auto_install-arch target to 
+    override_dh_auto_install-indep target. The HTML documentation is
+    built along with the code in the build-arch target.
+    (closes: #806620)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 07 Jan 2016 22:38:50 +0100
+
 grass (7.0.3~rc1-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.
diff --git a/debian/rules b/debian/rules
index 95cf2f9..9ea11ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ versions:
 	dh $@ --with autotools_dev,python2 --parallel
 
 override_dh_clean:
-	dh_clean
+	dh_clean build-arch-stamp install-arch-stamp
 
 	$(RM) lib/proj/nad2bin
 	$(RM) tools/timer/main.o
@@ -96,11 +96,13 @@ override_dh_auto_configure: templates
 
 # This target generates arch-dep stuff, unfortunately most doc requires working bins to 
 # be properly generated...
-override_dh_auto_build-arch:
+override_dh_auto_build-arch: build-arch-stamp
+build-arch-stamp:
 	dh_auto_build
 	chmod 755 debian/fixpaths.sh
+	touch $@
 
-override_dh_auto_build-indep: override_dh_auto_build-arch
+override_dh_auto_build-indep: build-arch-stamp
 	# generate the Programmers' manual (in HTML)
 	$(MAKE) htmldocs-single
 
@@ -109,7 +111,8 @@ override_dh_auto_build-indep: override_dh_auto_build-arch
 	##	optipng -o5 $$file ; \
 	##done
 
-override_dh_auto_install-arch:
+override_dh_auto_install-arch: install-arch-stamp
+install-arch-stamp:
 	# install grass core into debian/tmp
 	dh_auto_install -- \
 		INST_DIR=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \
@@ -227,7 +230,9 @@ override_dh_auto_install-arch:
 	mkdir -p debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/vdigit
 	mv debian/tmp/usr/lib/$(BASE_NAME)/gui/wxpython/vdigit/vdigit_toolbar.jpg debian/tmp/usr/share/$(BASE_NAME)/gui/wxpython/vdigit/
 
-override_dh_auto_install-indep:
+	touch $@
+
+override_dh_auto_install-indep: install-arch-stamp
 	install -m 644 -d debian/tmp
 	install -m 644 -d debian/tmp/programming-manual/html
 	cp -r lib/html/* debian/tmp/programming-manual/html/

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