Bug#1059210: xaos FTCBFS: invokes the build architecture qmake6

[Helmut Grohne]

Source: xaos
Version: 4.3.1-1
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

xaos fails to cross build from source, because it bypasses the qmake
detection required for cross building in debhelper. We've since added
--buildsystem=qmake6 that makes this all a lot simpler.

I note that my debhelper upload doesn't make cross building work, but
that's not your problem. I'll be sending a debhelper patch separtely.
Then it also fails executing /usr/libexec/rcc and that also looks like a
toolchain problem to be solved elsewhere. So this bug is only about
running the right qmake6. I appreciate an upload to have a test package
for those other issues soon.

Helmut
-------------- next part --------------
diff --minimal -Nru xaos-4.3.1/debian/changelog xaos-4.3.1/debian/changelog
--- xaos-4.3.1/debian/changelog	2023-12-04 23:01:33.000000000 +0100
+++ xaos-4.3.1/debian/changelog	2023-12-21 10:43:26.000000000 +0100
@@ -1,3 +1,10 @@
+xaos (4.3.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Improve FTCBFS: Use new dh --buildsystem=qmake6. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 21 Dec 2023 10:43:26 +0100
+
 xaos (4.3.1-1) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru xaos-4.3.1/debian/control xaos-4.3.1/debian/control
--- xaos-4.3.1/debian/control	2023-12-04 23:01:33.000000000 +0100
+++ xaos-4.3.1/debian/control	2023-12-21 10:43:26.000000000 +0100
@@ -2,6 +2,7 @@
 Section: graphics
 Priority: optional
 Build-Depends:
+ debhelper (>= 13.11.9),
  debhelper-compat (= 13),
  qt6-base-dev,
  qt6-l10n-tools,
diff --minimal -Nru xaos-4.3.1/debian/rules xaos-4.3.1/debian/rules
--- xaos-4.3.1/debian/rules	2023-12-04 22:57:04.000000000 +0100
+++ xaos-4.3.1/debian/rules	2023-12-21 10:43:24.000000000 +0100
@@ -5,13 +5,4 @@
 export QT_SELECT=qt6
 
 %:
-	dh $@
-
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057359
-override_dh_auto_configure:
-	ln -s /usr/bin/qmake6 ./qmake
-	PATH=`pwd`:$(PATH) dh_auto_configure
-
-override_dh_auto_clean:
-	$(RM) qmake
-	dh_auto_clean
+	dh $@ --buildsystem=qmake6