[Git][debian-gis-team/merkaartor][master] Fix FTCBFS: Let dh_auto_configure use a cross qmake. (closes: #959671)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / merkaartor


Commits:
946d3338 by Bas Couwenberg at 2020-05-03T18:24:06+02:00
Fix FTCBFS: Let dh_auto_configure use a cross qmake. (closes: #959671)

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+merkaartor (0.18.4+ds-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Let dh_auto_configure use a cross qmake.
+    (closes: #959671)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 03 May 2020 18:23:23 +0200
+
 merkaartor (0.18.4+ds-2) unstable; urgency=medium
 
   * source-only upload.


=====================================
debian/rules
=====================================
@@ -14,7 +14,7 @@ export DEB_CXXFLAGS_MAINT_APPEND=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 export QT_SELECT=5
 
 %:
-	dh $@
+	dh $@ --buildsystem=qmake
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -26,10 +26,9 @@ override_dh_clean:
 
 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 \



View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/946d3338d77bb2294425f1ef5b53b31129ca19b5

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/946d3338d77bb2294425f1ef5b53b31129ca19b5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200503/81556e5a/attachment-0001.html>