From 99f8a3c85c7f5af6c518ff43e6c58e181786bb01 Mon Sep 17 00:00:00 2001 From: Patrick Franz Date: Sun, 3 Mar 2024 19:35:15 +0100 Subject: [PATCH] NMU for 64-bit time_t transition. --- debian/changelog | 7 ++ debian/control | 97 ++++++++++++------- ...6.install => libqt6concurrent6t64.install} | 0 ...=> libqt6concurrent6t64.lintian-overrides} | 3 +- ...6.symbols => libqt6concurrent6t64.symbols} | 4 +- ...t6core6.install => libqt6core6t64.install} | 0 debian/libqt6core6t64.lintian-overrides | 1 + ...t6core6.symbols => libqt6core6t64.symbols} | 4 +- ...t6dbus6.install => libqt6dbus6t64.install} | 0 ...rides => libqt6dbus6t64.lintian-overrides} | 3 +- ...t6dbus6.symbols => libqt6dbus6t64.symbols} | 4 +- ...bqt6gui6.install => libqt6gui6t64.install} | 0 ...rrides => libqt6gui6t64.lintian-overrides} | 7 +- ...bqt6gui6.symbols => libqt6gui6t64.symbols} | 4 +- ...ork6.install => libqt6network6t64.install} | 0 ...es => libqt6network6t64.lintian-overrides} | 3 +- ...ork6.symbols => libqt6network6t64.symbols} | 4 +- debian/libqt6opengl6.lintian-overrides | 18 ---- ...engl6.install => libqt6opengl6t64.install} | 0 debian/libqt6opengl6t64.lintian-overrides | 19 ++++ ...engl6.symbols => libqt6opengl6t64.symbols} | 4 +- ...nstall => libqt6openglwidgets6t64.install} | 0 .../libqt6openglwidgets6t64.lintian-overrides | 4 + ...ymbols => libqt6openglwidgets6t64.symbols} | 4 +- debian/libqt6printsupport6.lintian-overrides | 3 - ...install => libqt6printsupport6t64.install} | 0 .../libqt6printsupport6t64.lintian-overrides | 4 + ...symbols => libqt6printsupport6t64.symbols} | 4 +- debian/libqt6sql6.lintian-overrides | 3 - ...bqt6sql6.install => libqt6sql6t64.install} | 0 ...rrides => libqt6sql6t64.lintian-overrides} | 3 +- ...bqt6sql6.symbols => libqt6sql6t64.symbols} | 4 +- debian/libqt6test6.lintian-overrides | 3 - ...t6test6.install => libqt6test6t64.install} | 0 ...rides => libqt6test6t64.lintian-overrides} | 3 +- ...t6test6.symbols => libqt6test6t64.symbols} | 4 +- ...ets6.install => libqt6widgets6t64.install} | 0 debian/libqt6widgets6t64.lintian-overrides | 4 + ...ets6.symbols => libqt6widgets6t64.symbols} | 4 +- debian/libqt6xml6.lintian-overrides | 3 - ...bqt6xml6.install => libqt6xml6t64.install} | 0 debian/libqt6xml6t64.lintian-overrides | 4 + ...bqt6xml6.symbols => libqt6xml6t64.symbols} | 4 +- 43 files changed, 144 insertions(+), 96 deletions(-) rename debian/{libqt6concurrent6.install => libqt6concurrent6t64.install} (100%) rename debian/{libqt6openglwidgets6.lintian-overrides => libqt6concurrent6t64.lintian-overrides} (55%) rename debian/{libqt6concurrent6.symbols => libqt6concurrent6t64.symbols} (94%) rename debian/{libqt6core6.install => libqt6core6t64.install} (100%) create mode 100644 debian/libqt6core6t64.lintian-overrides rename debian/{libqt6core6.symbols => libqt6core6t64.symbols} (99%) rename debian/{libqt6dbus6.install => libqt6dbus6t64.install} (100%) rename debian/{libqt6widgets6.lintian-overrides => libqt6dbus6t64.lintian-overrides} (56%) rename debian/{libqt6dbus6.symbols => libqt6dbus6t64.symbols} (99%) rename debian/{libqt6gui6.install => libqt6gui6t64.install} (100%) mode change 100755 => 100644 rename debian/{libqt6gui6.lintian-overrides => libqt6gui6t64.lintian-overrides} (63%) rename debian/{libqt6gui6.symbols => libqt6gui6t64.symbols} (99%) rename debian/{libqt6network6.install => libqt6network6t64.install} (100%) mode change 100755 => 100644 rename debian/{libqt6concurrent6.lintian-overrides => libqt6network6t64.lintian-overrides} (56%) rename debian/{libqt6network6.symbols => libqt6network6t64.symbols} (99%) delete mode 100644 debian/libqt6opengl6.lintian-overrides rename debian/{libqt6opengl6.install => libqt6opengl6t64.install} (100%) mode change 100755 => 100644 create mode 100644 debian/libqt6opengl6t64.lintian-overrides rename debian/{libqt6opengl6.symbols => libqt6opengl6t64.symbols} (99%) rename debian/{libqt6openglwidgets6.install => libqt6openglwidgets6t64.install} (100%) create mode 100644 debian/libqt6openglwidgets6t64.lintian-overrides rename debian/{libqt6openglwidgets6.symbols => libqt6openglwidgets6t64.symbols} (95%) delete mode 100644 debian/libqt6printsupport6.lintian-overrides rename debian/{libqt6printsupport6.install => libqt6printsupport6t64.install} (100%) create mode 100644 debian/libqt6printsupport6t64.lintian-overrides rename debian/{libqt6printsupport6.symbols => libqt6printsupport6t64.symbols} (99%) delete mode 100644 debian/libqt6sql6.lintian-overrides rename debian/{libqt6sql6.install => libqt6sql6t64.install} (100%) rename debian/{libqt6dbus6.lintian-overrides => libqt6sql6t64.lintian-overrides} (53%) rename debian/{libqt6sql6.symbols => libqt6sql6t64.symbols} (99%) delete mode 100644 debian/libqt6test6.lintian-overrides rename debian/{libqt6test6.install => libqt6test6t64.install} (100%) rename debian/{libqt6network6.lintian-overrides => libqt6test6t64.lintian-overrides} (56%) rename debian/{libqt6test6.symbols => libqt6test6t64.symbols} (98%) rename debian/{libqt6widgets6.install => libqt6widgets6t64.install} (100%) create mode 100644 debian/libqt6widgets6t64.lintian-overrides rename debian/{libqt6widgets6.symbols => libqt6widgets6t64.symbols} (99%) delete mode 100644 debian/libqt6xml6.lintian-overrides rename debian/{libqt6xml6.install => libqt6xml6t64.install} (100%) create mode 100644 debian/libqt6xml6t64.lintian-overrides rename debian/{libqt6xml6.symbols => libqt6xml6t64.symbols} (99%) diff --git a/debian/changelog b/debian/changelog index 3884ea9..a287920 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +qt6-base (6.4.2+dfsg-21.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. Closes: #1062725 + + -- Benjamin Drung Thu, 29 Feb 2024 21:45:27 +0000 + qt6-base (6.4.2+dfsg-21) unstable; urgency=medium [ Patrick Franz ] diff --git a/debian/control b/debian/control index 473cb39..02fc80b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: qt6-base Priority: optional Maintainer: Debian Qt/KDE Maintainers Uploaders: Patrick Franz , -Build-Depends: cmake (>= 3.24~), +Build-Depends: dpkg-dev (>= 1.22.5), cmake (>= 3.24~), debhelper-compat (= 13), default-libmysqlclient-dev, dh-exec, @@ -82,11 +82,13 @@ Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-base.git Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-base -Package: libqt6core6 +Package: libqt6core6t64 +Replaces: libqt6core6 +Breaks: libqt6core6 (<< ${source:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, -Provides: qt6-base-abi (= 6.4.2), +Provides: ${t64:Provides}, qt6-base-abi (= 6.4.2), Depends: shared-mime-info, ${misc:Depends}, ${shlibs:Depends}, Recommends: qt6-translations-l10n, Description: Qt 6 core module @@ -95,7 +97,10 @@ Description: Qt 6 core module . The QtCore module contains core non-GUI functionality. -Package: libqt6concurrent6 +Package: libqt6concurrent6t64 +Provides: ${t64:Provides} +Replaces: libqt6concurrent6 +Breaks: libqt6concurrent6 (<< ${source:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, @@ -107,7 +112,10 @@ Description: Qt 6 concurrent module The QtConcurrent module contains functionality to support concurrent execution of program code. -Package: libqt6dbus6 +Package: libqt6dbus6t64 +Provides: ${t64:Provides} +Replaces: libqt6dbus6 +Breaks: libqt6dbus6 (<< ${source:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, @@ -123,13 +131,14 @@ Description: Qt 6 D-Bus module applications by exporting objects, as well as use services exported by those applications by placing calls and accessing properties. -Package: libqt6gui6 +Package: libqt6gui6t64 +Provides: ${t64:Provides} Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}, -Breaks: qt6-qpa-plugins (<< 6.3.1+dfsg-6~), -Replaces: qt6-qpa-plugins (<< 6.3.1+dfsg-6~), +Breaks: libqt6gui6 (<< ${source:Version}), qt6-qpa-plugins (<< 6.3.1+dfsg-6~), +Replaces: libqt6gui6, qt6-qpa-plugins (<< 6.3.1+dfsg-6~), Recommends: qt6-gtk-platformtheme, qt6-qpa-plugins, qt6-wayland [linux-any], Description: Qt 6 GUI module Qt is a cross-platform C++ application framework. Qt's primary feature @@ -142,9 +151,9 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}, -Breaks: libqt6gui6 (<< 6.3.1+dfsg-6~), - libqt6network6 (<< 6.2.4+dfsg-5~), - libqt6opengl6 (<< 6.3.1+dfsg-6~), +Breaks: libqt6gui6t64 (<< 6.3.1+dfsg-6~), + libqt6network6t64 (<< 6.2.4+dfsg-5~), + libqt6opengl6t64 (<< 6.3.1+dfsg-6~), Description: Qt 6 QPA plugins Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -177,13 +186,14 @@ Description: Qt 6 XDG Desktop Portal platform theme This package provides the XDG Desktop portal platform theme, which makes Qt use native file dialogs on Flatpak/Snap based environments. -Package: libqt6opengl6 +Package: libqt6opengl6t64 +Provides: ${t64:Provides} Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: ${misc:Depends}, ${shlibs:Depends}, -Breaks: qt6-qpa-plugins (<< 6.3.1+dfsg-6~), -Replaces: qt6-qpa-plugins (<< 6.3.1+dfsg-6~), +Breaks: libqt6opengl6 (<< ${source:Version}), qt6-qpa-plugins (<< 6.3.1+dfsg-6~), +Replaces: libqt6opengl6, qt6-qpa-plugins (<< 6.3.1+dfsg-6~), Description: Qt 6 OpenGL module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -194,7 +204,10 @@ Description: Qt 6 OpenGL module OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D rendering and provides little or no support for GUI programming issues. -Package: libqt6openglwidgets6 +Package: libqt6openglwidgets6t64 +Provides: ${t64:Provides} +Replaces: libqt6openglwidgets6 +Breaks: libqt6openglwidgets6 (<< ${source:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, @@ -211,13 +224,14 @@ Description: Qt 6 OpenGL widgets module . The OpenGL widgets module provides the widget for rendering OpenGL graphics. -Package: libqt6network6 +Package: libqt6network6t64 +Provides: ${t64:Provides} Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: ${libssl:Depends}, ${misc:Depends}, ${shlibs:Depends}, -Breaks: qt6-qpa-plugins (<< 6.2.4+dfsg-5~), -Replaces: qt6-qpa-plugins (<< 6.2.4+dfsg-5~), +Breaks: libqt6network6 (<< ${source:Version}), qt6-qpa-plugins (<< 6.2.4+dfsg-5~), +Replaces: libqt6network6, qt6-qpa-plugins (<< 6.2.4+dfsg-5~), Description: Qt 6 network module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -225,7 +239,10 @@ Description: Qt 6 network module The QtNetwork module offers classes that allow you to write TCP/IP clients and servers. It provides classes to make network programming easier and portable. -Package: libqt6sql6 +Package: libqt6sql6t64 +Provides: ${t64:Provides} +Replaces: libqt6sql6 +Breaks: libqt6sql6 (<< ${source:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, @@ -293,7 +310,10 @@ Description: Qt 6 Firebird database driver Install it if you intend to use or write Qt programs that are to access a Firebird/InterBase DB. -Package: libqt6test6 +Package: libqt6test6t64 +Provides: ${t64:Provides} +Replaces: libqt6test6 +Breaks: libqt6test6 (<< ${source:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, @@ -305,7 +325,10 @@ Description: Qt 6 test module The QtTest module provides classes for unit testing Qt applications and libraries. -Package: libqt6widgets6 +Package: libqt6widgets6t64 +Provides: ${t64:Provides} +Replaces: libqt6widgets6 +Breaks: libqt6widgets6 (<< ${source:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, @@ -316,7 +339,10 @@ Description: Qt 6 widgets module . The QtWidgets module extends QtGui with C++ widget functionality. -Package: libqt6xml6 +Package: libqt6xml6t64 +Provides: ${t64:Provides} +Replaces: libqt6xml6 +Breaks: libqt6xml6 (<< ${source:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, @@ -328,7 +354,10 @@ Description: Qt 6 XML module The QtXml module provides a stream reader and writer for XML documents, and C++ implementations of SAX and DOM. -Package: libqt6printsupport6 +Package: libqt6printsupport6t64 +Provides: ${t64:Provides} +Replaces: libqt6printsupport6 +Breaks: libqt6printsupport6 (<< ${source:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, @@ -348,17 +377,17 @@ Multi-Arch: same Depends: libgl-dev, libglx-dev, libopengl-dev, - libqt6concurrent6 (= ${binary:Version}), - libqt6core6 (= ${binary:Version}), - libqt6dbus6 (= ${binary:Version}), - libqt6gui6 (= ${binary:Version}), - libqt6network6 (= ${binary:Version}), - libqt6openglwidgets6 (= ${binary:Version}), - libqt6printsupport6 (= ${binary:Version}), - libqt6sql6 (= ${binary:Version}), - libqt6test6 (= ${binary:Version}), - libqt6widgets6 (= ${binary:Version}), - libqt6xml6 (= ${binary:Version}), + libqt6concurrent6t64 (= ${binary:Version}), + libqt6core6t64 (= ${binary:Version}), + libqt6dbus6t64 (= ${binary:Version}), + libqt6gui6t64 (= ${binary:Version}), + libqt6network6t64 (= ${binary:Version}), + libqt6openglwidgets6t64 (= ${binary:Version}), + libqt6printsupport6t64 (= ${binary:Version}), + libqt6sql6t64 (= ${binary:Version}), + libqt6test6t64 (= ${binary:Version}), + libqt6widgets6t64 (= ${binary:Version}), + libqt6xml6t64 (= ${binary:Version}), libvulkan-dev [linux-any], qmake6 (= ${binary:Version}), qt6-base-dev-tools (= ${binary:Version}), diff --git a/debian/libqt6concurrent6.install b/debian/libqt6concurrent6t64.install similarity index 100% rename from debian/libqt6concurrent6.install rename to debian/libqt6concurrent6t64.install diff --git a/debian/libqt6openglwidgets6.lintian-overrides b/debian/libqt6concurrent6t64.lintian-overrides similarity index 55% rename from debian/libqt6openglwidgets6.lintian-overrides rename to debian/libqt6concurrent6t64.lintian-overrides index 3dd5f50..d657e59 100644 --- a/debian/libqt6openglwidgets6.lintian-overrides +++ b/debian/libqt6concurrent6t64.lintian-overrides @@ -1,3 +1,4 @@ # This dependency has been added to track external packages building against # our private headers. It is ok if internal packages depend on the ABI one. -libqt6openglwidgets6: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6concurrent6t64: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6concurrent6t64: package-name-doesnt-match-sonames libqt6concurrent6 diff --git a/debian/libqt6concurrent6.symbols b/debian/libqt6concurrent6t64.symbols similarity index 94% rename from debian/libqt6concurrent6.symbols rename to debian/libqt6concurrent6t64.symbols index 49195ae..4cf6433 100644 --- a/debian/libqt6concurrent6.symbols +++ b/debian/libqt6concurrent6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.0 amd64 -libQt6Concurrent.so.6 libqt6concurrent6 #MINVER# -| libqt6concurrent6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6Concurrent.so.6 libqt6concurrent6t64 #MINVER# +| libqt6concurrent6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2 diff --git a/debian/libqt6core6.install b/debian/libqt6core6t64.install similarity index 100% rename from debian/libqt6core6.install rename to debian/libqt6core6t64.install diff --git a/debian/libqt6core6t64.lintian-overrides b/debian/libqt6core6t64.lintian-overrides new file mode 100644 index 0000000..36bd164 --- /dev/null +++ b/debian/libqt6core6t64.lintian-overrides @@ -0,0 +1 @@ +libqt6core6t64: package-name-doesnt-match-sonames libqt6core6 diff --git a/debian/libqt6core6.symbols b/debian/libqt6core6t64.symbols similarity index 99% rename from debian/libqt6core6.symbols rename to debian/libqt6core6t64.symbols index 7c64e30..ba26173 100644 --- a/debian/libqt6core6.symbols +++ b/debian/libqt6core6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.2 amd64 arm64 armel armhf hurd-i386 i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 -libQt6Core.so.6 libqt6core6 #MINVER# -| libqt6core6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6Core.so.6 libqt6core6t64 #MINVER# +| libqt6core6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2 diff --git a/debian/libqt6dbus6.install b/debian/libqt6dbus6t64.install similarity index 100% rename from debian/libqt6dbus6.install rename to debian/libqt6dbus6t64.install diff --git a/debian/libqt6widgets6.lintian-overrides b/debian/libqt6dbus6t64.lintian-overrides similarity index 56% rename from debian/libqt6widgets6.lintian-overrides rename to debian/libqt6dbus6t64.lintian-overrides index 288907a..ec895ed 100644 --- a/debian/libqt6widgets6.lintian-overrides +++ b/debian/libqt6dbus6t64.lintian-overrides @@ -1,3 +1,4 @@ # This dependency has been added to track external packages building against # our private headers. It is ok if internal packages depend on the ABI one. -libqt6widgets6: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6dbus6t64: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6dbus6t64: package-name-doesnt-match-sonames libqt6dbus6 diff --git a/debian/libqt6dbus6.symbols b/debian/libqt6dbus6t64.symbols similarity index 99% rename from debian/libqt6dbus6.symbols rename to debian/libqt6dbus6t64.symbols index 65c50a5..2f077ac 100644 --- a/debian/libqt6dbus6.symbols +++ b/debian/libqt6dbus6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.1 amd64 -libQt6DBus.so.6 libqt6dbus6 #MINVER# -| libqt6dbus6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6DBus.so.6 libqt6dbus6t64 #MINVER# +| libqt6dbus6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2 diff --git a/debian/libqt6gui6.install b/debian/libqt6gui6t64.install old mode 100755 new mode 100644 similarity index 100% rename from debian/libqt6gui6.install rename to debian/libqt6gui6t64.install diff --git a/debian/libqt6gui6.lintian-overrides b/debian/libqt6gui6t64.lintian-overrides similarity index 63% rename from debian/libqt6gui6.lintian-overrides rename to debian/libqt6gui6t64.lintian-overrides index adc1497..88927a2 100644 --- a/debian/libqt6gui6.lintian-overrides +++ b/debian/libqt6gui6t64.lintian-overrides @@ -1,6 +1,6 @@ # This dependency has been added to track external packages building against # our private headers. It is ok if internal packages depend on the ABI one. -libqt6gui6: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6gui6t64: symbols-declares-dependency-on-other-package qt6-base-abi * # libQt6XcbQpa is actually a private library *only* used by its # platforms plugins. @@ -9,5 +9,6 @@ libqt6gui6: symbols-declares-dependency-on-other-package qt6-base-abi * # We are still shipping the headers but they only contain the version and # the only binaries that depend on them are shipped within this very same # binary package, so it's safe to override these Lintian warnings. -libqt6gui6: ships-undeclared-shared-library libQt6XcbQpa 6 for usr/lib/*/libQt6XcbQpa.so.6.* -libqt6gui6: shared-library-symbols-not-tracked libQt6XcbQpa 6 for usr/lib/*/libQt6XcbQpa.so.6.* [symbols] +libqt6gui6t64: ships-undeclared-shared-library libQt6XcbQpa 6 for usr/lib/*/libQt6XcbQpa.so.6.* +libqt6gui6t64: shared-library-symbols-not-tracked libQt6XcbQpa 6 for usr/lib/*/libQt6XcbQpa.so.6.* [symbols] +libqt6gui6t64: package-name-doesnt-match-sonames libqt6gui6 diff --git a/debian/libqt6gui6.symbols b/debian/libqt6gui6t64.symbols similarity index 99% rename from debian/libqt6gui6.symbols rename to debian/libqt6gui6t64.symbols index 475a863..86aad2e 100644 --- a/debian/libqt6gui6.symbols +++ b/debian/libqt6gui6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.1 amd64 -libQt6Gui.so.6 libqt6gui6 #MINVER# -| libqt6gui6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6Gui.so.6 libqt6gui6t64 #MINVER# +| libqt6gui6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2 diff --git a/debian/libqt6network6.install b/debian/libqt6network6t64.install old mode 100755 new mode 100644 similarity index 100% rename from debian/libqt6network6.install rename to debian/libqt6network6t64.install diff --git a/debian/libqt6concurrent6.lintian-overrides b/debian/libqt6network6t64.lintian-overrides similarity index 56% rename from debian/libqt6concurrent6.lintian-overrides rename to debian/libqt6network6t64.lintian-overrides index c852519..27ad14a 100644 --- a/debian/libqt6concurrent6.lintian-overrides +++ b/debian/libqt6network6t64.lintian-overrides @@ -1,3 +1,4 @@ # This dependency has been added to track external packages building against # our private headers. It is ok if internal packages depend on the ABI one. -libqt6concurrent6: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6network6t64: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6network6t64: package-name-doesnt-match-sonames libqt6network6 diff --git a/debian/libqt6network6.symbols b/debian/libqt6network6t64.symbols similarity index 99% rename from debian/libqt6network6.symbols rename to debian/libqt6network6t64.symbols index 168a844..d2481fe 100644 --- a/debian/libqt6network6.symbols +++ b/debian/libqt6network6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.2 amd64 arm64 armel armhf hppa hurd-i386 i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x -libQt6Network.so.6 libqt6network6 #MINVER# -| libqt6network6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6Network.so.6 libqt6network6t64 #MINVER# +| libqt6network6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2 diff --git a/debian/libqt6opengl6.lintian-overrides b/debian/libqt6opengl6.lintian-overrides deleted file mode 100644 index a8cefee..0000000 --- a/debian/libqt6opengl6.lintian-overrides +++ /dev/null @@ -1,18 +0,0 @@ -# This dependency has been added to track external packages building against -# our private headers. It is ok if internal packages depend on the ABI one. -libqt6opengl6: symbols-declares-dependency-on-other-package qt6-base-abi * - -# libQt6EglFSDeviceIntegration, libQt6EglFsKmsGbmSupport and libQt6EglFsKmsSupport -# are actually private libraries *only* used by their -# respective platforms plugins. -# Sadly instead of being installed into a proper place like -# /usr/lib//qt6/ they are being installed into /usr/lib/. -# We are still shipping the headers but they only contain the version and -# the only binaries that depend on them are shipped within this very same -# binary package, so it's safe to override these Lintian warnings. -libqt6opengl6: shared-library-symbols-not-tracked libQt6EglFSDeviceIntegration 6 for usr/lib/*/libQt6EglFSDeviceIntegration.so.6.* [symbols] -libqt6opengl6: shared-library-symbols-not-tracked libQt6EglFsKmsGbmSupport 6 for usr/lib/*/libQt6EglFsKmsGbmSupport.so.6.* [symbols] -libqt6opengl6: shared-library-symbols-not-tracked libQt6EglFsKmsSupport 6 for usr/lib/*/libQt6EglFsKmsSupport.so.6.* [symbols] -libqt6opengl6: ships-undeclared-shared-library libQt6EglFSDeviceIntegration 6 for usr/lib/*/libQt6EglFSDeviceIntegration.so.6.* [shlibs] -libqt6opengl6: ships-undeclared-shared-library libQt6EglFsKmsGbmSupport 6 for usr/lib/*/libQt6EglFsKmsGbmSupport.so.6.* [shlibs] -libqt6opengl6: ships-undeclared-shared-library libQt6EglFsKmsSupport 6 for usr/lib/*/libQt6EglFsKmsSupport.so.6.* [shlibs] diff --git a/debian/libqt6opengl6.install b/debian/libqt6opengl6t64.install old mode 100755 new mode 100644 similarity index 100% rename from debian/libqt6opengl6.install rename to debian/libqt6opengl6t64.install diff --git a/debian/libqt6opengl6t64.lintian-overrides b/debian/libqt6opengl6t64.lintian-overrides new file mode 100644 index 0000000..9a4d89a --- /dev/null +++ b/debian/libqt6opengl6t64.lintian-overrides @@ -0,0 +1,19 @@ +# This dependency has been added to track external packages building against +# our private headers. It is ok if internal packages depend on the ABI one. +libqt6opengl6t64: symbols-declares-dependency-on-other-package qt6-base-abi * + +# libQt6EglFSDeviceIntegration, libQt6EglFsKmsGbmSupport and libQt6EglFsKmsSupport +# are actually private libraries *only* used by their +# respective platforms plugins. +# Sadly instead of being installed into a proper place like +# /usr/lib//qt6/ they are being installed into /usr/lib/. +# We are still shipping the headers but they only contain the version and +# the only binaries that depend on them are shipped within this very same +# binary package, so it's safe to override these Lintian warnings. +libqt6opengl6t64: shared-library-symbols-not-tracked libQt6EglFSDeviceIntegration 6 for usr/lib/*/libQt6EglFSDeviceIntegration.so.6.* [symbols] +libqt6opengl6t64: shared-library-symbols-not-tracked libQt6EglFsKmsGbmSupport 6 for usr/lib/*/libQt6EglFsKmsGbmSupport.so.6.* [symbols] +libqt6opengl6t64: shared-library-symbols-not-tracked libQt6EglFsKmsSupport 6 for usr/lib/*/libQt6EglFsKmsSupport.so.6.* [symbols] +libqt6opengl6t64: ships-undeclared-shared-library libQt6EglFSDeviceIntegration 6 for usr/lib/*/libQt6EglFSDeviceIntegration.so.6.* [shlibs] +libqt6opengl6t64: ships-undeclared-shared-library libQt6EglFsKmsGbmSupport 6 for usr/lib/*/libQt6EglFsKmsGbmSupport.so.6.* [shlibs] +libqt6opengl6t64: ships-undeclared-shared-library libQt6EglFsKmsSupport 6 for usr/lib/*/libQt6EglFsKmsSupport.so.6.* [shlibs] +libqt6opengl6t64: package-name-doesnt-match-sonames libqt6opengl6 diff --git a/debian/libqt6opengl6.symbols b/debian/libqt6opengl6t64.symbols similarity index 99% rename from debian/libqt6opengl6.symbols rename to debian/libqt6opengl6t64.symbols index 8e63f89..8af0d7e 100644 --- a/debian/libqt6opengl6.symbols +++ b/debian/libqt6opengl6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.1 amd64 -libQt6OpenGL.so.6 libqt6opengl6 #MINVER# -| libqt6opengl6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6OpenGL.so.6 libqt6opengl6t64 #MINVER# +| libqt6opengl6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2 diff --git a/debian/libqt6openglwidgets6.install b/debian/libqt6openglwidgets6t64.install similarity index 100% rename from debian/libqt6openglwidgets6.install rename to debian/libqt6openglwidgets6t64.install diff --git a/debian/libqt6openglwidgets6t64.lintian-overrides b/debian/libqt6openglwidgets6t64.lintian-overrides new file mode 100644 index 0000000..52a270d --- /dev/null +++ b/debian/libqt6openglwidgets6t64.lintian-overrides @@ -0,0 +1,4 @@ +# This dependency has been added to track external packages building against +# our private headers. It is ok if internal packages depend on the ABI one. +libqt6openglwidgets6t64: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6openglwidgets6t64: package-name-doesnt-match-sonames libqt6openglwidgets6 diff --git a/debian/libqt6openglwidgets6.symbols b/debian/libqt6openglwidgets6t64.symbols similarity index 95% rename from debian/libqt6openglwidgets6.symbols rename to debian/libqt6openglwidgets6t64.symbols index d5d332f..f74e57d 100644 --- a/debian/libqt6openglwidgets6.symbols +++ b/debian/libqt6openglwidgets6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.0 amd64 -libQt6OpenGLWidgets.so.6 libqt6openglwidgets6 #MINVER# -| libqt6openglwidgets6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6OpenGLWidgets.so.6 libqt6openglwidgets6t64 #MINVER# +| libqt6openglwidgets6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2 diff --git a/debian/libqt6printsupport6.lintian-overrides b/debian/libqt6printsupport6.lintian-overrides deleted file mode 100644 index ce8da6c..0000000 --- a/debian/libqt6printsupport6.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# This dependency has been added to track external packages building against -# our private headers. It is ok if internal packages depend on the ABI one. -libqt6printsupport6: symbols-declares-dependency-on-other-package qt6-base-abi * diff --git a/debian/libqt6printsupport6.install b/debian/libqt6printsupport6t64.install similarity index 100% rename from debian/libqt6printsupport6.install rename to debian/libqt6printsupport6t64.install diff --git a/debian/libqt6printsupport6t64.lintian-overrides b/debian/libqt6printsupport6t64.lintian-overrides new file mode 100644 index 0000000..6e7e55f --- /dev/null +++ b/debian/libqt6printsupport6t64.lintian-overrides @@ -0,0 +1,4 @@ +# This dependency has been added to track external packages building against +# our private headers. It is ok if internal packages depend on the ABI one. +libqt6printsupport6t64: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6printsupport6t64: package-name-doesnt-match-sonames libqt6printsupport6 diff --git a/debian/libqt6printsupport6.symbols b/debian/libqt6printsupport6t64.symbols similarity index 99% rename from debian/libqt6printsupport6.symbols rename to debian/libqt6printsupport6t64.symbols index 18c2a14..500014d 100644 --- a/debian/libqt6printsupport6.symbols +++ b/debian/libqt6printsupport6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.0 amd64 -libQt6PrintSupport.so.6 libqt6printsupport6 #MINVER# -| libqt6printsupport6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6PrintSupport.so.6 libqt6printsupport6t64 #MINVER# +| libqt6printsupport6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2 diff --git a/debian/libqt6sql6.lintian-overrides b/debian/libqt6sql6.lintian-overrides deleted file mode 100644 index 1853e55..0000000 --- a/debian/libqt6sql6.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# This dependency has been added to track external packages building against -# our private headers. It is ok if internal packages depend on the ABI one. -libqt6sql6: symbols-declares-dependency-on-other-package qt6-base-abi * diff --git a/debian/libqt6sql6.install b/debian/libqt6sql6t64.install similarity index 100% rename from debian/libqt6sql6.install rename to debian/libqt6sql6t64.install diff --git a/debian/libqt6dbus6.lintian-overrides b/debian/libqt6sql6t64.lintian-overrides similarity index 53% rename from debian/libqt6dbus6.lintian-overrides rename to debian/libqt6sql6t64.lintian-overrides index 628eb4d..bfc82fb 100644 --- a/debian/libqt6dbus6.lintian-overrides +++ b/debian/libqt6sql6t64.lintian-overrides @@ -1,3 +1,4 @@ # This dependency has been added to track external packages building against # our private headers. It is ok if internal packages depend on the ABI one. -libqt6dbus6: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6sql6t64: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6sql6t64: package-name-doesnt-match-sonames libqt6sql6 diff --git a/debian/libqt6sql6.symbols b/debian/libqt6sql6t64.symbols similarity index 99% rename from debian/libqt6sql6.symbols rename to debian/libqt6sql6t64.symbols index 2a193b7..841dc5d 100644 --- a/debian/libqt6sql6.symbols +++ b/debian/libqt6sql6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.1 amd64 -libQt6Sql.so.6 libqt6sql6 #MINVER# -| libqt6sql6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6Sql.so.6 libqt6sql6t64 #MINVER# +| libqt6sql6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2 diff --git a/debian/libqt6test6.lintian-overrides b/debian/libqt6test6.lintian-overrides deleted file mode 100644 index f29be25..0000000 --- a/debian/libqt6test6.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# This dependency has been added to track external packages building against -# our private headers. It is ok if internal packages depend on the ABI one. -libqt6test6: symbols-declares-dependency-on-other-package qt6-base-abi * diff --git a/debian/libqt6test6.install b/debian/libqt6test6t64.install similarity index 100% rename from debian/libqt6test6.install rename to debian/libqt6test6t64.install diff --git a/debian/libqt6network6.lintian-overrides b/debian/libqt6test6t64.lintian-overrides similarity index 56% rename from debian/libqt6network6.lintian-overrides rename to debian/libqt6test6t64.lintian-overrides index a35fd5f..2b0e1e3 100644 --- a/debian/libqt6network6.lintian-overrides +++ b/debian/libqt6test6t64.lintian-overrides @@ -1,3 +1,4 @@ # This dependency has been added to track external packages building against # our private headers. It is ok if internal packages depend on the ABI one. -libqt6network6: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6test6t64: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6test6t64: package-name-doesnt-match-sonames libqt6test6 diff --git a/debian/libqt6test6.symbols b/debian/libqt6test6t64.symbols similarity index 98% rename from debian/libqt6test6.symbols rename to debian/libqt6test6t64.symbols index 9ed970a..4941c20 100644 --- a/debian/libqt6test6.symbols +++ b/debian/libqt6test6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.1 amd64 -libQt6Test.so.6 libqt6test6 #MINVER# -| libqt6test6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6Test.so.6 libqt6test6t64 #MINVER# +| libqt6test6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2 diff --git a/debian/libqt6widgets6.install b/debian/libqt6widgets6t64.install similarity index 100% rename from debian/libqt6widgets6.install rename to debian/libqt6widgets6t64.install diff --git a/debian/libqt6widgets6t64.lintian-overrides b/debian/libqt6widgets6t64.lintian-overrides new file mode 100644 index 0000000..3133bcf --- /dev/null +++ b/debian/libqt6widgets6t64.lintian-overrides @@ -0,0 +1,4 @@ +# This dependency has been added to track external packages building against +# our private headers. It is ok if internal packages depend on the ABI one. +libqt6widgets6t64: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6widgets6t64: package-name-doesnt-match-sonames libqt6widgets6 diff --git a/debian/libqt6widgets6.symbols b/debian/libqt6widgets6t64.symbols similarity index 99% rename from debian/libqt6widgets6.symbols rename to debian/libqt6widgets6t64.symbols index 495c430..2737f09 100644 --- a/debian/libqt6widgets6.symbols +++ b/debian/libqt6widgets6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.2 armel armhf -libQt6Widgets.so.6 libqt6widgets6 #MINVER# -| libqt6widgets6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6Widgets.so.6 libqt6widgets6t64 #MINVER# +| libqt6widgets6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2 diff --git a/debian/libqt6xml6.lintian-overrides b/debian/libqt6xml6.lintian-overrides deleted file mode 100644 index c8ca0c9..0000000 --- a/debian/libqt6xml6.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# This dependency has been added to track external packages building against -# our private headers. It is ok if internal packages depend on the ABI one. -libqt6xml6: symbols-declares-dependency-on-other-package qt6-base-abi * diff --git a/debian/libqt6xml6.install b/debian/libqt6xml6t64.install similarity index 100% rename from debian/libqt6xml6.install rename to debian/libqt6xml6t64.install diff --git a/debian/libqt6xml6t64.lintian-overrides b/debian/libqt6xml6t64.lintian-overrides new file mode 100644 index 0000000..e0f2bfc --- /dev/null +++ b/debian/libqt6xml6t64.lintian-overrides @@ -0,0 +1,4 @@ +# This dependency has been added to track external packages building against +# our private headers. It is ok if internal packages depend on the ABI one. +libqt6xml6t64: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6xml6t64: package-name-doesnt-match-sonames libqt6xml6 diff --git a/debian/libqt6xml6.symbols b/debian/libqt6xml6t64.symbols similarity index 99% rename from debian/libqt6xml6.symbols rename to debian/libqt6xml6t64.symbols index 59b21d2..5543920 100644 --- a/debian/libqt6xml6.symbols +++ b/debian/libqt6xml6t64.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.4.1 amd64 -libQt6Xml.so.6 libqt6xml6 #MINVER# -| libqt6xml6 #MINVER#, qt6-base-abi (= 6.4.2) +libQt6Xml.so.6 libqt6xml6t64 #MINVER# +| libqt6xml6t64 #MINVER#, qt6-base-abi (= 6.4.2) * Build-Depends-Package: qt6-base-dev Qt_6.0@Qt_6.0 6.1.2 Qt_6.1@Qt_6.1 6.1.2