diff --git a/debian/changelog b/debian/changelog index 6e7b494..07687ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ qt6-base (6.2.4+dfsg-10) UNRELEASED; urgency=medium + [ Lisandro Damián Nicanor Pérez Meyer ] + * 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. + -- Debian Qt/KDE Maintainers Thu, 07 Jul 2022 11:22:19 -0300 qt6-base (6.2.4+dfsg-9) unstable; urgency=medium diff --git a/debian/not-installed b/debian/not-installed index 4ae0541..db4f51f 100644 --- a/debian/not-installed +++ b/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 diff --git a/debian/qt6-base-dev-tools.install b/debian/qt6-base-dev-tools.install index 32b0c79..65ed91a 100644 --- a/debian/qt6-base-dev-tools.install +++ b/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 diff --git a/debian/qt6-base-dev-tools.links b/debian/qt6-base-dev-tools.links new file mode 100644 index 0000000..e77b2d2 --- /dev/null +++ b/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