[neon/qt6/qt6-base/Neon/release] debian: qtpaths and qmake should definitely be in qt6-base-dev

[Carlos De Maine]

Git commit 11f82ff11598897be5108b6e5273b98304db7af8 by Carlos De Maine.
Committed on 20/05/2026 at 02:40.
Pushed by carlosdem into branch 'Neon/release'.

qtpaths and qmake should definitely be in qt6-base-dev

M  +2    -0    debian/control
M  +0    -1    debian/qt6-base-dev.install
M  +9    -3    debian/qt6-base-dev.links
M  +0    -4    debian/qt6-base.install
M  +0    -6    debian/qt6-base.links

https://invent.kde.org/neon/qt6/qt6-base/-/commit/11f82ff11598897be5108b6e5273b98304db7af8

diff --git a/debian/control b/debian/control
index f1659ed..b7a3481 100644
--- a/debian/control
+++ b/debian/control
@@ -262,11 +262,13 @@ Depends: firebird-dev,
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: libqt6opengl6-dev (<< 6.4.2+dfsg-12~),
+        qt6-base-dev (<< 6.11.1),
         qt6-wayland (<< 6.10.0),
         qt6-wayland-dev (<< 6.10.0),
 Conflicts: qt6-wayland (<< 6.10.0),
            qt6-wayland-dev (<< 6.10.0),
 Replaces: libqt6opengl6-dev (<< 6.4.2+dfsg-12~),
+          qt6-base-dev (<< 6.11.1),
 Provides: libqt6opengl6-dev (= ${binary:Version}),
 Description: Qt 6 base development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/qt6-base-dev.install b/debian/qt6-base-dev.install
index 7379c50..45cf015 100755
--- a/debian/qt6-base-dev.install
+++ b/debian/qt6-base-dev.install
@@ -1,4 +1,3 @@
-#!/usr/bin/dh-exec
 usr/include/
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6*.prl
diff --git a/debian/qt6-base-dev.links b/debian/qt6-base-dev.links
index 85e6b8e..8e8e262 100644
--- a/debian/qt6-base-dev.links
+++ b/debian/qt6-base-dev.links
@@ -1,15 +1,21 @@
+# On public path we want qmake6.
+usr/lib/qt6/bin/qmake6 usr/bin/qmake6
+# qmake and qmake6 are identical files. We want people to use qmake6,
+# so we do not install qmake. Instead, qmake is a symbolic link pointing to qmake6.
+usr/lib/qt6/bin/qmake6 usr/lib/qt6/bin/qmake
+
+# On public path we want qtpaths6.
+usr/lib/qt6/bin/qtpaths6 usr/bin/qtpaths6
 # qtpaths and qtpaths6 are identical files. We want people to use qtpaths6,
 # so we do not install qtpaths. Instead, qtpaths is a symbolic link pointing to qtpaths6.
 usr/lib/qt6/bin/qtpaths6 usr/lib/qt6/bin/qtpaths
 
-# On public path we want qtpaths6.
-usr/lib/qt6/bin/qtpaths6 usr/bin/qtpaths6
+# On public path we want androiddeployqt6 et al.
 
 # androiddeployqt and androiddeployqt6 are identical files. We want people to use androiddeployqt6,
 # so we do not install androiddeployqt. Instead, androiddeployqt is a symbolic link pointing to androiddeployqt6.
 usr/lib/qt6/bin/androiddeployqt6 usr/lib/qt6/bin/androiddeployqt
 
-# On public path we want androiddeployqt6 et al.
 usr/lib/qt6/bin/androiddeployqt6 usr/bin/androiddeployqt6
 usr/lib/qt6/bin/androidtestrunner usr/bin/androidtestrunner6
 usr/lib/qt6/bin/qdbuscpp2xml usr/bin/qdbuscpp2xmlusr6
diff --git a/debian/qt6-base.install b/debian/qt6-base.install
index 8e73902..57fc230 100644
--- a/debian/qt6-base.install
+++ b/debian/qt6-base.install
@@ -1,12 +1,8 @@
-usr/bin/*-qmake6
-usr/bin/*-qpaths6
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6*.so.*
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qt6.conf
-usr/lib/qt6/bin/qmake
-usr/lib/qt6/bin/qmake6
 usr/lib/qt6/libexec/qt-internal-configure-examples
 usr/lib/qt6/libexec/qt_cyclonedx_generator.py
 usr/lib/qt6/libexec/qtwaylandscanner
diff --git a/debian/qt6-base.links b/debian/qt6-base.links
index e569e1f..e69de29 100644
--- a/debian/qt6-base.links
+++ b/debian/qt6-base.links
@@ -1,6 +0,0 @@
-## qmake6.links
-# qmake and qmake6 are identical files. We want people to use qmake6,
-# so we do not install qmake. Instead, qmake is a symbolic link pointing to qmake6.
-usr/lib/qt6/bin/qmake6 usr/lib/qt6/bin/qmake
-# On public path we want qmake6.
-usr/lib/qt6/bin/qmake6 usr/bin/qmake6