From 026b26b1dbdace834fdb497d1bd883e1f369bac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= Date: Fri, 29 Apr 2022 22:48:12 -0300 Subject: [PATCH 1/4] New changelog entry. --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 36d57b6..4118033 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,8 @@ +qt6-base (6.2.4+dfsg-5) UNRELEASED; urgency=medium + + + -- Debian Qt/KDE Maintainers Fri, 29 Apr 2022 22:47:58 -0300 + qt6-base (6.2.4+dfsg-4) unstable; urgency=medium [ Patrick Franz ] From 8f69546918d2bcf10cb5a89a50bc90f560c68399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= Date: Fri, 29 Apr 2022 23:00:55 -0300 Subject: [PATCH 2/4] Move plugins to the packes they belong to. This fixes bug #1009632. --- debian/changelog | 5 +++++ debian/control | 5 +++++ debian/libqt6gui6.install | 3 +++ debian/libqt6network6.install | 2 ++ debian/qt6-qpa-plugins.install | 5 ----- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4118033..61f602c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ qt6-base (6.2.4+dfsg-5) UNRELEASED; urgency=medium + [ Lisandro Damián Nicanor Pérez Meyer ] + * Move plugins to the package they do belong to: + - libqcertonlybackend.so and libqopensslbackend.so to libqt6network6. + - libqgif.so, libqico.so and libqjpeg.so to libqt6gui6. + (Closes: #1009632). -- Debian Qt/KDE Maintainers Fri, 29 Apr 2022 22:47:58 -0300 diff --git a/debian/control b/debian/control index f96473c..866d343 100644 --- a/debian/control +++ b/debian/control @@ -125,6 +125,8 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends} +Breaks: qt6-qpa-plugins (<< 6.2.4+dfsg-5~) +Replaces: qt6-qpa-plugins (<< 6.2.4+dfsg-5~) Recommends: qt6-gtk-platformtheme Description: Qt 6 GUI module Qt is a cross-platform C++ application framework. Qt's primary feature @@ -137,6 +139,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends} +Breaks: libqt6network6 (<< 6.2.4+dfsg-5~), libqt6gui6 (<< 6.2.4+dfsg-5~) Description: Qt 6 EGL plugins Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -204,6 +207,8 @@ 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~) 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. diff --git a/debian/libqt6gui6.install b/debian/libqt6gui6.install index decfbdd..50a211c 100644 --- a/debian/libqt6gui6.install +++ b/debian/libqt6gui6.install @@ -1 +1,4 @@ +usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqgif.so +usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqico.so +usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqjpeg.so usr/lib/${DEB_HOST_MULTIARCH}/libQt6Gui.so.* diff --git a/debian/libqt6network6.install b/debian/libqt6network6.install index 3351db0..91c411a 100755 --- a/debian/libqt6network6.install +++ b/debian/libqt6network6.install @@ -1,3 +1,5 @@ #!/usr/bin/dh-exec usr/lib/${DEB_HOST_MULTIARCH}/libQt6Network.so.* [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/networkinformation/libqnetworkmanager.so +usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/tls/libqcertonlybackend.so +usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/tls/libqopensslbackend.so diff --git a/debian/qt6-qpa-plugins.install b/debian/qt6-qpa-plugins.install index 79df8a4..c89233f 100755 --- a/debian/qt6-qpa-plugins.install +++ b/debian/qt6-qpa-plugins.install @@ -14,9 +14,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-x11-in [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqlibinputplugin.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqtslibplugin.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqtuiotouchplugin.so -usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqgif.so -usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqico.so -usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqjpeg.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqeglfs.so @@ -28,6 +25,4 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqvnc.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqxcb.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/xcbglintegrations/libqxcb-glx-integration.so [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqvkkhrdisplay.so -usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/tls/libqcertonlybackend.so -usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/tls/libqopensslbackend.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/xcbglintegrations/libqxcb-egl-integration.so From ed0776890a7f6f6f1ea2201efcc24d354367170c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= Date: Fri, 29 Apr 2022 23:27:22 -0300 Subject: [PATCH 3/4] No-op wrap-and-sort. --- debian/control | 16 ++++++++-------- debian/libqt6gui6.install | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/control b/debian/control index 866d343..b8ca2f8 100644 --- a/debian/control +++ b/debian/control @@ -72,7 +72,7 @@ Build-Depends: cmake (>= 3.18~), pkg-config, pkg-kde-tools (>= 0.15.17~), unixodbc-dev, - zlib1g-dev, + zlib1g-dev Standards-Version: 4.6.0 Section: libs Homepage: https://www.qt.io/developers/ @@ -139,7 +139,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends} -Breaks: libqt6network6 (<< 6.2.4+dfsg-5~), libqt6gui6 (<< 6.2.4+dfsg-5~) +Breaks: libqt6gui6 (<< 6.2.4+dfsg-5~), libqt6network6 (<< 6.2.4+dfsg-5~) Description: Qt 6 EGL plugins Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -221,7 +221,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: libqt6sql6-sqlite | libqt6sql6-mysql | libqt6sql6-odbc | libqt6sql6-psql | libqt6sql6-ibase, +Recommends: libqt6sql6-sqlite | libqt6sql6-mysql | libqt6sql6-odbc | libqt6sql6-psql | libqt6sql6-ibase Description: Qt 6 SQL module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -353,7 +353,7 @@ Depends: libgl-dev, qmake6 (= ${binary:Version}), qt6-base-dev-tools (= ${binary:Version}), qt6-qpa-plugins (= ${binary:Version}), - ${misc:Depends}, + ${misc:Depends} Recommends: libqt6opengl6-dev (= ${binary:Version}) Description: Qt 6 base development files Qt is a cross-platform C++ application framework. Qt's primary feature @@ -373,7 +373,7 @@ Depends: libfontconfig-dev, libinput-dev [linux-any], libxkbcommon-dev, qt6-base-dev (= ${binary:Version}), - ${misc:Depends}, + ${misc:Depends} Description: Qt 6 base private development files Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -390,7 +390,7 @@ Section: devel Depends: qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}, ${perl:Depends}, - ${shlibs:Depends}, + ${shlibs:Depends} Description: Qt 6 base development programs Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -408,7 +408,7 @@ Multi-Arch: same Section: libdevel Depends: libqt6opengl6 (= ${binary:Version}), qt6-base-dev (= ${binary:Version}), - ${misc:Depends}, + ${misc:Depends} Description: Qt 6 OpenGL library development files Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -436,7 +436,7 @@ Depends: qmake6-bin (= ${binary:Version}), qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}, ${perl:Depends}, - ${shlibs:Depends}, + ${shlibs:Depends} Description: Qt 6 qmake Makefile generator tool Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. diff --git a/debian/libqt6gui6.install b/debian/libqt6gui6.install index 50a211c..ad55b8f 100644 --- a/debian/libqt6gui6.install +++ b/debian/libqt6gui6.install @@ -1,4 +1,4 @@ +usr/lib/${DEB_HOST_MULTIARCH}/libQt6Gui.so.* usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqgif.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqico.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/libqjpeg.so -usr/lib/${DEB_HOST_MULTIARCH}/libQt6Gui.so.* From 47ea4ecb65a549c794ef5d605ad95180e6696539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= Date: Sat, 30 Apr 2022 09:43:12 -0300 Subject: [PATCH 4/4] wrap-and-sort -t The team uses -t as default. --- debian/control | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index b8ca2f8..3adaa7c 100644 --- a/debian/control +++ b/debian/control @@ -72,7 +72,7 @@ Build-Depends: cmake (>= 3.18~), pkg-config, pkg-kde-tools (>= 0.15.17~), unixodbc-dev, - zlib1g-dev + zlib1g-dev, Standards-Version: 4.6.0 Section: libs Homepage: https://www.qt.io/developers/ @@ -221,7 +221,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: libqt6sql6-sqlite | libqt6sql6-mysql | libqt6sql6-odbc | libqt6sql6-psql | libqt6sql6-ibase +Recommends: libqt6sql6-sqlite | libqt6sql6-mysql | libqt6sql6-odbc | libqt6sql6-psql | libqt6sql6-ibase, Description: Qt 6 SQL module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -353,7 +353,7 @@ Depends: libgl-dev, qmake6 (= ${binary:Version}), qt6-base-dev-tools (= ${binary:Version}), qt6-qpa-plugins (= ${binary:Version}), - ${misc:Depends} + ${misc:Depends}, Recommends: libqt6opengl6-dev (= ${binary:Version}) Description: Qt 6 base development files Qt is a cross-platform C++ application framework. Qt's primary feature @@ -373,7 +373,7 @@ Depends: libfontconfig-dev, libinput-dev [linux-any], libxkbcommon-dev, qt6-base-dev (= ${binary:Version}), - ${misc:Depends} + ${misc:Depends}, Description: Qt 6 base private development files Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -390,7 +390,7 @@ Section: devel Depends: qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}, ${perl:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, Description: Qt 6 base development programs Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -408,7 +408,7 @@ Multi-Arch: same Section: libdevel Depends: libqt6opengl6 (= ${binary:Version}), qt6-base-dev (= ${binary:Version}), - ${misc:Depends} + ${misc:Depends}, Description: Qt 6 OpenGL library development files Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -436,7 +436,7 @@ Depends: qmake6-bin (= ${binary:Version}), qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}, ${perl:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, Description: Qt 6 qmake Makefile generator tool Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality.