diff --git a/debian/changelog b/debian/changelog index e5953cf..4354a95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,11 @@ qt6-base (6.7.2+dfsg-4) UNRELEASED; urgency=medium - mark 64bit symbols as such - drop ia64 markers, as that architecture was discontinued + [ Patrick Franz ] + * Do not ship the androiddeployqt tool any more and always use + androiddeployqt6 instead. Also, add a symlink for androiddeployqt6 + in /usr/bin. + -- Debian Qt/KDE Maintainers Mon, 07 Oct 2024 22:17:21 +0200 qt6-base (6.7.2+dfsg-3) unstable; urgency=medium diff --git a/debian/not-installed b/debian/not-installed index d03f04c..46b58b0 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -6,6 +6,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6GuiPlugins.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Network/Qt6NetworkPlugins.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PrintSupport/Qt6PrintSupportPlugins.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Sql/Qt6SqlPlugins.cmake +usr/lib/qt6/bin/androiddeployqt usr/lib/qt6/bin/qmake usr/lib/qt6/bin/qtpaths # cross build specific: diff --git a/debian/qt6-base-dev-tools.install b/debian/qt6-base-dev-tools.install index 4e42290..8faf49c 100644 --- a/debian/qt6-base-dev-tools.install +++ b/debian/qt6-base-dev-tools.install @@ -1,4 +1,3 @@ -usr/lib/qt6/bin/androiddeployqt usr/lib/qt6/bin/androiddeployqt6 usr/lib/qt6/bin/androidtestrunner usr/lib/qt6/bin/qdbuscpp2xml diff --git a/debian/qt6-base-dev-tools.links b/debian/qt6-base-dev-tools.links index e77b2d2..bdb0fd8 100644 --- a/debian/qt6-base-dev-tools.links +++ b/debian/qt6-base-dev-tools.links @@ -3,3 +3,9 @@ usr/lib/qt6/bin/qtpaths6 usr/lib/qt6/bin/qtpaths # On public path we want qtpaths6. usr/lib/qt6/bin/qtpaths6 usr/bin/qtpaths6 + +# 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. +usr/lib/qt6/bin/androiddeployqt6 usr/bin/androiddeployqt