From 7ac05a0f5e7868f25c8d78a77c143f295d4f9e06 Mon Sep 17 00:00:00 2001 From: Patrick Franz Date: Thu, 12 Oct 2023 17:49:03 +0200 Subject: [PATCH] Rename the virtual ABI package to qt6-base-private-abi. --- debian/changelog | 3 +++ debian/control | 2 +- debian/libqt6concurrent6.lintian-overrides | 2 +- debian/libqt6concurrent6.symbols | 2 +- debian/libqt6core6.symbols | 2 +- debian/libqt6dbus6.lintian-overrides | 2 +- debian/libqt6dbus6.symbols | 2 +- debian/libqt6gui6.lintian-overrides | 2 +- debian/libqt6gui6.symbols | 2 +- debian/libqt6network6.lintian-overrides | 2 +- debian/libqt6network6.symbols | 2 +- debian/libqt6opengl6.lintian-overrides | 2 +- debian/libqt6opengl6.symbols | 2 +- debian/libqt6openglwidgets6.lintian-overrides | 2 +- debian/libqt6openglwidgets6.symbols | 2 +- debian/libqt6printsupport6.lintian-overrides | 2 +- debian/libqt6printsupport6.symbols | 2 +- debian/libqt6sql6.lintian-overrides | 2 +- debian/libqt6sql6.symbols | 2 +- debian/libqt6test6.lintian-overrides | 2 +- debian/libqt6test6.symbols | 2 +- debian/libqt6widgets6.lintian-overrides | 2 +- debian/libqt6widgets6.symbols | 2 +- debian/libqt6xml6.lintian-overrides | 2 +- debian/libqt6xml6.symbols | 2 +- 25 files changed, 27 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0f0b3b..e68c57b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ qt6-base (6.6.0+dfsg-2) UNRELEASED; urgency=medium + [ Patrick Franz ] + * Rename the virtual ABI package to qt6-base-private-abi. + -- Debian Qt/KDE Maintainers Thu, 12 Oct 2023 17:42:13 +0200 qt6-base (6.6.0+dfsg-1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 346a72f..2909756 100644 --- a/debian/control +++ b/debian/control @@ -86,7 +86,7 @@ Package: libqt6core6 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, -Provides: qt6-base-abi (= 6.6.0), +Provides: qt6-base-private-abi (= 6.6.0), Depends: shared-mime-info, ${misc:Depends}, ${shlibs:Depends}, Recommends: qt6-translations-l10n, Description: Qt 6 core module diff --git a/debian/libqt6concurrent6.lintian-overrides b/debian/libqt6concurrent6.lintian-overrides index c852519..22fbc99 100644 --- a/debian/libqt6concurrent6.lintian-overrides +++ b/debian/libqt6concurrent6.lintian-overrides @@ -1,3 +1,3 @@ # 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 * +libqt6concurrent6: symbols-declares-dependency-on-other-package qt6-base-private-abi * diff --git a/debian/libqt6concurrent6.symbols b/debian/libqt6concurrent6.symbols index c850fd9..4094864 100644 --- a/debian/libqt6concurrent6.symbols +++ b/debian/libqt6concurrent6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6Concurrent.so.6 libqt6concurrent6 #MINVER# -| libqt6concurrent6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6concurrent6 #MINVER#, qt6-base-private-abi (= 6.6.0) * Build-Depends-Package: qt6-base-dev Qt_6@Qt_6 6.1.2 (symver)Qt_6_PRIVATE_API 0 1 diff --git a/debian/libqt6core6.symbols b/debian/libqt6core6.symbols index cd7ded5..a64371f 100644 --- a/debian/libqt6core6.symbols +++ b/debian/libqt6core6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6Core.so.6 libqt6core6 #MINVER# -| libqt6core6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6core6 #MINVER#, qt6-base-private-abi (= 6.6.0) * 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.lintian-overrides b/debian/libqt6dbus6.lintian-overrides index 628eb4d..75cb419 100644 --- a/debian/libqt6dbus6.lintian-overrides +++ b/debian/libqt6dbus6.lintian-overrides @@ -1,3 +1,3 @@ # 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 * +libqt6dbus6: symbols-declares-dependency-on-other-package qt6-base-private-abi * diff --git a/debian/libqt6dbus6.symbols b/debian/libqt6dbus6.symbols index 6deb87f..6852392 100644 --- a/debian/libqt6dbus6.symbols +++ b/debian/libqt6dbus6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6DBus.so.6 libqt6dbus6 #MINVER# -| libqt6dbus6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6dbus6 #MINVER#, qt6-base-private-abi (= 6.6.0) * Build-Depends-Package: qt6-base-dev Qt_6@Qt_6 6.1.2 (symver)Qt_6_PRIVATE_API 0 1 diff --git a/debian/libqt6gui6.lintian-overrides b/debian/libqt6gui6.lintian-overrides index adc1497..afb9ee4 100644 --- a/debian/libqt6gui6.lintian-overrides +++ b/debian/libqt6gui6.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 * +libqt6gui6: symbols-declares-dependency-on-other-package qt6-base-private-abi * # libQt6XcbQpa is actually a private library *only* used by its # platforms plugins. diff --git a/debian/libqt6gui6.symbols b/debian/libqt6gui6.symbols index 72917a4..f141274 100644 --- a/debian/libqt6gui6.symbols +++ b/debian/libqt6gui6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6Gui.so.6 libqt6gui6 #MINVER# -| libqt6gui6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6gui6 #MINVER#, qt6-base-private-abi (= 6.6.0) * Build-Depends-Package: qt6-base-dev Qt_6@Qt_6 6.1.2 (symver)Qt_6_PRIVATE_API 0 1 diff --git a/debian/libqt6network6.lintian-overrides b/debian/libqt6network6.lintian-overrides index a35fd5f..b38264b 100644 --- a/debian/libqt6network6.lintian-overrides +++ b/debian/libqt6network6.lintian-overrides @@ -1,3 +1,3 @@ # 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 * +libqt6network6: symbols-declares-dependency-on-other-package qt6-base-private-abi * diff --git a/debian/libqt6network6.symbols b/debian/libqt6network6.symbols index f55a5ec..2dc392a 100644 --- a/debian/libqt6network6.symbols +++ b/debian/libqt6network6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6Network.so.6 libqt6network6 #MINVER# -| libqt6network6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6network6 #MINVER#, qt6-base-private-abi (= 6.6.0) * Build-Depends-Package: qt6-base-dev Qt_6@Qt_6 6.1.2 (symver)Qt_6_PRIVATE_API 0 1 diff --git a/debian/libqt6opengl6.lintian-overrides b/debian/libqt6opengl6.lintian-overrides index a8cefee..47e3dbf 100644 --- a/debian/libqt6opengl6.lintian-overrides +++ b/debian/libqt6opengl6.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. -libqt6opengl6: symbols-declares-dependency-on-other-package qt6-base-abi * +libqt6opengl6: symbols-declares-dependency-on-other-package qt6-base-private-abi * # libQt6EglFSDeviceIntegration, libQt6EglFsKmsGbmSupport and libQt6EglFsKmsSupport # are actually private libraries *only* used by their diff --git a/debian/libqt6opengl6.symbols b/debian/libqt6opengl6.symbols index 762b334..ef7922d 100644 --- a/debian/libqt6opengl6.symbols +++ b/debian/libqt6opengl6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6OpenGL.so.6 libqt6opengl6 #MINVER# -| libqt6opengl6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6opengl6 #MINVER#, qt6-base-private-abi (= 6.6.0) * Build-Depends-Package: qt6-base-dev Qt_6@Qt_6 6.1.2 (symver)Qt_6_PRIVATE_API 0 1 diff --git a/debian/libqt6openglwidgets6.lintian-overrides b/debian/libqt6openglwidgets6.lintian-overrides index 3dd5f50..964dc82 100644 --- a/debian/libqt6openglwidgets6.lintian-overrides +++ b/debian/libqt6openglwidgets6.lintian-overrides @@ -1,3 +1,3 @@ # 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 * +libqt6openglwidgets6: symbols-declares-dependency-on-other-package qt6-base-private-abi * diff --git a/debian/libqt6openglwidgets6.symbols b/debian/libqt6openglwidgets6.symbols index 1933ee5..7191f97 100644 --- a/debian/libqt6openglwidgets6.symbols +++ b/debian/libqt6openglwidgets6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6OpenGLWidgets.so.6 libqt6openglwidgets6 #MINVER# -| libqt6openglwidgets6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6openglwidgets6 #MINVER#, qt6-base-private-abi (= 6.6.0) * Build-Depends-Package: qt6-base-dev Qt_6@Qt_6 6.1.2 (symver)Qt_6_PRIVATE_API 0 1 diff --git a/debian/libqt6printsupport6.lintian-overrides b/debian/libqt6printsupport6.lintian-overrides index ce8da6c..3ff5c6b 100644 --- a/debian/libqt6printsupport6.lintian-overrides +++ b/debian/libqt6printsupport6.lintian-overrides @@ -1,3 +1,3 @@ # 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 * +libqt6printsupport6: symbols-declares-dependency-on-other-package qt6-base-private-abi * diff --git a/debian/libqt6printsupport6.symbols b/debian/libqt6printsupport6.symbols index dc60ead..8a37cce 100644 --- a/debian/libqt6printsupport6.symbols +++ b/debian/libqt6printsupport6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6PrintSupport.so.6 libqt6printsupport6 #MINVER# -| libqt6printsupport6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6printsupport6 #MINVER#, qt6-base-private-abi (= 6.6.0) * Build-Depends-Package: qt6-base-dev Qt_6@Qt_6 6.1.2 (symver)Qt_6_PRIVATE_API 0 1 diff --git a/debian/libqt6sql6.lintian-overrides b/debian/libqt6sql6.lintian-overrides index 1853e55..9580150 100644 --- a/debian/libqt6sql6.lintian-overrides +++ b/debian/libqt6sql6.lintian-overrides @@ -1,3 +1,3 @@ # 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 * +libqt6sql6: symbols-declares-dependency-on-other-package qt6-base-private-abi * diff --git a/debian/libqt6sql6.symbols b/debian/libqt6sql6.symbols index 9ceca5e..a19200f 100644 --- a/debian/libqt6sql6.symbols +++ b/debian/libqt6sql6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6Sql.so.6 libqt6sql6 #MINVER# -| libqt6sql6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6sql6 #MINVER#, qt6-base-private-abi (= 6.6.0) * Build-Depends-Package: qt6-base-dev Qt_6@Qt_6 6.1.2 (symver)Qt_6_PRIVATE_API 0 1 diff --git a/debian/libqt6test6.lintian-overrides b/debian/libqt6test6.lintian-overrides index f29be25..dfc0994 100644 --- a/debian/libqt6test6.lintian-overrides +++ b/debian/libqt6test6.lintian-overrides @@ -1,3 +1,3 @@ # 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 * +libqt6test6: symbols-declares-dependency-on-other-package qt6-base-private-abi * diff --git a/debian/libqt6test6.symbols b/debian/libqt6test6.symbols index ef6047f..da1dbc6 100644 --- a/debian/libqt6test6.symbols +++ b/debian/libqt6test6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6Test.so.6 libqt6test6 #MINVER# -| libqt6test6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6test6 #MINVER#, qt6-base-private-abi (= 6.6.0) * Build-Depends-Package: qt6-base-dev Qt_6@Qt_6 6.1.2 (symver)Qt_6_PRIVATE_API 0 1 diff --git a/debian/libqt6widgets6.lintian-overrides b/debian/libqt6widgets6.lintian-overrides index 288907a..51ac5e2 100644 --- a/debian/libqt6widgets6.lintian-overrides +++ b/debian/libqt6widgets6.lintian-overrides @@ -1,3 +1,3 @@ # 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 * +libqt6widgets6: symbols-declares-dependency-on-other-package qt6-base-private-abi * diff --git a/debian/libqt6widgets6.symbols b/debian/libqt6widgets6.symbols index eec1fe2..51c683a 100644 --- a/debian/libqt6widgets6.symbols +++ b/debian/libqt6widgets6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6Widgets.so.6 libqt6widgets6 #MINVER# -| libqt6widgets6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6widgets6 #MINVER#, qt6-base-private-abi (= 6.6.0) * Build-Depends-Package: qt6-base-dev Qt_6@Qt_6 6.1.2 (symver)Qt_6_PRIVATE_API 0 1 diff --git a/debian/libqt6xml6.lintian-overrides b/debian/libqt6xml6.lintian-overrides index c8ca0c9..a34f9a6 100644 --- a/debian/libqt6xml6.lintian-overrides +++ b/debian/libqt6xml6.lintian-overrides @@ -1,3 +1,3 @@ # 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 * +libqt6xml6: symbols-declares-dependency-on-other-package qt6-base-private-abi * diff --git a/debian/libqt6xml6.symbols b/debian/libqt6xml6.symbols index cf62b46..ea90785 100644 --- a/debian/libqt6xml6.symbols +++ b/debian/libqt6xml6.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 6.6.0 amd64 libQt6Xml.so.6 libqt6xml6 #MINVER# -| libqt6xml6 #MINVER#, qt6-base-abi (= 6.6.0) +| libqt6xml6 #MINVER#, qt6-base-private-abi (= 6.6.0) * Build-Depends-Package: qt6-base-dev Qt_6@Qt_6 6.1.2 (symver)Qt_6_PRIVATE_API 0 1