[Debian-astro-maintainers] Bug#946284: dpuser FTCBFS: runs the build architecture qmake

[Helmut Grohne]

Source: dpuser
Version: 4.0+dfsg-2
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

Thank you for applying my previous patch. I looked into dpuser again and
why it would run the wrong qmake. The qmake invocation seems to be
wrapped in a custom Makefile. I wasn't able to fix that Makefile, but we
can side step the entire Makefile and run qmake through
dh_auto_configure instead. In particular, this patch makes dpuser cross
buildable. Do you find the attached patch acceptable?

Helmut
-------------- next part --------------
diff --minimal -Nru dpuser-4.0+dfsg/debian/changelog dpuser-4.0+dfsg/debian/changelog
--- dpuser-4.0+dfsg/debian/changelog	2019-09-12 21:24:15.000000000 +0200
+++ dpuser-4.0+dfsg/debian/changelog	2019-12-06 17:01:12.000000000 +0100
@@ -1,3 +1,10 @@
+dpuser (4.0+dfsg-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Let dh_auto_configure run the right qmake. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Fri, 06 Dec 2019 17:01:12 +0100
+
 dpuser (4.0+dfsg-2) unstable; urgency=low
 
   [ Helmut Grohne ]
diff --minimal -Nru dpuser-4.0+dfsg/debian/rules dpuser-4.0+dfsg/debian/rules
--- dpuser-4.0+dfsg/debian/rules	2019-09-12 08:55:00.000000000 +0200
+++ dpuser-4.0+dfsg/debian/rules	2019-12-06 17:01:12.000000000 +0100
@@ -10,7 +10,8 @@
 
 override_dh_auto_build:
 	dh_auto_build --sourcedirectory=dpuser --no-parallel
-	$(MAKE) -C QFitsView release_shared
+	dh_auto_configure --buildsystem=qmake --sourcedirectory=QFitsView -- "CONFIG+=release qf_shared"
+	dh_auto_build --buildsystem=qmake --sourcedirectory=QFitsView -- -f qfitsview.mk
 
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 override_dh_auto_test: