Bug#959671: merkaartor FTCBFS: uses the build architecture qmake

[Helmut Grohne]

Source: merkaartor
Version: 0.18.4+ds-2
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

merkaartor fails to cross build from source, because debian/rules runs
the build architecture qmake. A simple way of using the host qmake is
running it through dh_auto_configure. Please consider applying the
attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru merkaartor-0.18.4+ds/debian/changelog merkaartor-0.18.4+ds/debian/changelog
--- merkaartor-0.18.4+ds/debian/changelog	2020-04-29 21:49:20.000000000 +0200
+++ merkaartor-0.18.4+ds/debian/changelog	2020-05-03 17:55:55.000000000 +0200
@@ -1,3 +1,10 @@
+merkaartor (0.18.4+ds-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Let dh_auto_configure use a cross qmake. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sun, 03 May 2020 17:55:55 +0200
+
 merkaartor (0.18.4+ds-2) unstable; urgency=medium
 
   * source-only upload.
diff --minimal -Nru merkaartor-0.18.4+ds/debian/rules merkaartor-0.18.4+ds/debian/rules
--- merkaartor-0.18.4+ds/debian/rules	2020-02-07 10:45:40.000000000 +0100
+++ merkaartor-0.18.4+ds/debian/rules	2020-05-03 17:55:55.000000000 +0200
@@ -14,7 +14,7 @@
 export QT_SELECT=5
 
 %:
-	dh $@
+	dh $@ --buildsystem=qmake
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -26,10 +26,9 @@
 
 override_dh_auto_configure:
 	cd translations && make release
-	qmake -recursive \
+	dh_auto_configure -- -recursive \
 		Merkaartor.pro \
 		TRANSDIR_SYSTEM="/usr/share/qt5/translations/" \
-		PREFIX=/usr \
 		GDAL=1 \
 		GEOIMAGE=1 \
 		GPSDLIB=1 \