[neon/qt6/qt6-base/Neon/release] debian: fix path in Qt6CoreToolsTargets.cmake and lints

[Carlos De Maine]

Git commit 4470cc6f4978b02ccbd8fe9a0a13184007c7abe3 by Carlos De Maine.
Committed on 01/05/2025 at 03:55.
Pushed by carlosdem into branch 'Neon/release'.

fix path in Qt6CoreToolsTargets.cmake and lints

M  +2    -1    debian/control
M  +5    -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/4470cc6f4978b02ccbd8fe9a0a13184007c7abe3

diff --git a/debian/control b/debian/control
index 11550b1..0d13880 100644
--- a/debian/control
+++ b/debian/control
@@ -180,6 +180,7 @@ Depends: libgl-dev,
          libqt6widgets6 (= ${binary:Version}),
          libqt6xml6 (= ${binary:Version}),
          libvulkan-dev,
+         python3:any,
          qmake6 (= ${binary:Version}),
          qt6-base-dev-tools (= ${binary:Version}),
          qt6-qpa-plugins (= ${binary:Version}),
@@ -448,4 +449,4 @@ Package: qt6-xdgdesktopportal-platformtheme
 Architecture: all
 Depends: qt6-base, ${misc:Depends}
 Description: Dummy transitional
- Transitional dummy package.
\ No newline at end of file
+ Transitional dummy package.
diff --git a/debian/rules b/debian/rules
index ae7478c..bc0f694 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,14 +109,17 @@ execute_after_dh_auto_install-arch:
 	chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6 debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qtpaths6
 
 	# Fix Qt6::qmake IMPORTED_LOCATION, see https://bugs.debian.org/1030980
+	sed -i 's,lib/qt6/bin/qmake,bin/$(DEB_HOST_GNU_TYPE)-qmake6,' \
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets.cmake
 	sed -i 's,lib/qt6/bin/qmake,bin/$(DEB_HOST_GNU_TYPE)-qmake6,' \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-relwithdebinfo.cmake
-
 	# Fix Qt6::qtpaths IMPORTED_LOCATION
+	sed -i 's,lib/qt6/bin/qtpaths,bin/$(DEB_HOST_GNU_TYPE)-qtpaths6,' \
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets.cmake
 	sed -i 's,lib/qt6/bin/qtpaths,bin/$(DEB_HOST_GNU_TYPE)-qtpaths6,' \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-relwithdebinfo.cmake
 
-ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter !nodoc,$(DEB_BUILD_PROFILES)),)
 override_dh_auto_build-indep:
 	dh_auto_build