Merge branch 'master' into experimental

debian/changelog

@@ -44,6 +44,14 @@ qt6-base (6.3.0+dfsg-1) experimental; urgency=medium
 
  -- Patrick Franz <deltaone@debian.org>  Mon, 23 May 2022 20:12:56 +0200
 
+qt6-base (6.2.4+dfsg-10) unstable; urgency=medium
+
+  * Team upload.
+  * qtpaths and qtpaths6 follow the same logic as qmake and qmake6: they are
+    both identical files. Only install qtpaths6 and link it into /usr/bin.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Thu, 07 Jul 2022 11:30:30 -0300
+
 qt6-base (6.2.4+dfsg-9) unstable; urgency=medium
 
   * Team upload.

debian/not-installed

@@ -3,3 +3,4 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/extra-cmake-modules/qt_attribut
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/kwin/COPYING-CMAKE-SCRIPTS
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/kwin/qt_attribution.json
 usr/lib/qt6/bin/qmake
+usr/lib/qt6/bin/qtpaths

debian/qt6-base-dev-tools.install

@@ -7,7 +7,6 @@ usr/lib/qt6/bin/qt-cmake-private
 usr/lib/qt6/bin/qt-cmake-private-install.cmake
 usr/lib/qt6/bin/qt-cmake-standalone-test
 usr/lib/qt6/bin/qt-configure-module
-usr/lib/qt6/bin/qtpaths
 usr/lib/qt6/bin/qtpaths6
 usr/lib/qt6/libexec/android_emulator_launcher.sh
 usr/lib/qt6/libexec/cmake_automoc_parser

debian/qt6-base-dev-tools.links

@@ -0,0 +1,5 @@
+# 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