[osm-gps-map] 01/02: Switch to dh_autoreconf

[Ross Gammon]

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

ross-guest pushed a commit to branch master
in repository osm-gps-map.

commit cdb552ba925d63a8c12e846f604eaddc0cdc4d24
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Sat Dec 5 00:32:31 2015 +0100

    Switch to dh_autoreconf
---
 debian/control |  2 +-
 debian/rules   | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 6fe9c34..519e45f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Priority: optional
 Build-Depends: debhelper (>= 9~),
                libtool,
                automake,
-               autoconf,
+               dh-autoreconf,
                d-shlibs,
                libgtk-3-dev,
                libgirepository1.0-dev,
diff --git a/debian/rules b/debian/rules
index 5ab5d7a..e6f9c5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,32 +11,31 @@ export DEB_BUILD_HARDENING=1
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 
 override_dh_auto_configure:
-	NOCONFIGURE=y ./autogen.sh
 	dh_auto_configure -- \
-		--enable-maintainer-mode \
-		--enable-gtk-doc \
-		--enable-gtk-doc-html \
-		--enable-gtk-doc-pdf
+		--enable-gtk-doc
 
 override_dh_auto_install:
 	dh_auto_install
 	dh_girepository
 
 override_dh_install:
-	rm `find debian/tmp -name '*.la'`
-	d-shlibmove --commit \
-		    --multiarch \
-		    --override s/libgtk-3-0-dev/libgtk-3-dev/ \
-		    --override s/libsoup-2.4-1-dev/libsoup2.4-dev/ \
-		    --override s/libcairo-gobject2-dev/libcairo2-dev/ \
-		    --override s/libgdk-3-0-dev/libgtk-3-dev/ \
-		    --movedev debian/tmp/usr/include/* usr/include \
-		    debian/tmp/usr/lib/*/lib*.so
+#	rm `find debian/tmp -name '*.la'`
+#	d-shlibmove --commit \
+#		    --multiarch \
+#		    --override s/libgtk-3-0-dev/libgtk-3-dev/ \
+#		    --override s/libsoup-2.4-1-dev/libsoup2.4-dev/ \
+#		    --override s/libcairo-gobject2-dev/libcairo2-dev/ \
+#		    --override s/libgdk-3-0-dev/libgtk-3-dev/ \
+#		    --movedev debian/tmp/usr/include/* usr/include \
+#		    debian/tmp/usr/lib/*/lib*.so
 	dh_install --list-missing
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf docs/reference/tmpl/
+
+override_dh_autoreconf:
+	NOCONFIGURE=y ./autogen.sh
+	dh_autoreconf
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -v$(UPSTREAM_VERSION)
@@ -45,4 +44,4 @@ override_dh_strip:
 	dh_strip --keep-debug --dbg-package=libosmgpsmap-1.0-dbg
 
 %:
-	dh $@
+	dh $@ --with autoreconf

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