Merge branch 'bug_109632' into 'master'

Move plugins to the packes they belong to.

See merge request qt-kde-team/qt6/qt6-base!10

debian/changelog

@@ -1,3 +1,13 @@
+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 <debian-qt-kde@lists.debian.org>  Fri, 29 Apr 2022 22:47:58 -0300
+
 qt6-base (6.2.4+dfsg-4) unstable; urgency=medium
 
   [ Patrick Franz ]

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: 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.
@@ -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.

debian/libqt6gui6.install

@@ -1 +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

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

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