[neon/qt6/qt6-base/Neon/release] debian: breaks/replaces split packages. simplify .install

Jonathan Esk-Riddell null at kde.org
Fri Nov 4 14:32:07 GMT 2022


Git commit 2bed83f6f090e6f39cd878571f98ba565e73bd5a by Jonathan Esk-Riddell.
Committed on 04/11/2022 at 14:32.
Pushed by jriddell into branch 'Neon/release'.

breaks/replaces split packages.  simplify .install

M  +54   -7    debian/control
M  +1    -52   debian/qt6-base.install

https://invent.kde.org/neon/qt6/qt6-base/commit/2bed83f6f090e6f39cd878571f98ba565e73bd5a

diff --git a/debian/control b/debian/control
index 6440706..9828f15 100644
--- a/debian/control
+++ b/debian/control
@@ -111,10 +111,48 @@ Depends: fontconfig,
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Recommends: libcups2,
-            libqt6sql6-sqlite | libqt6sql6-mysql | libqt6sql6-odbc | libqt6sql6-psql | libqt6sql6-ibase,
-            qt6-gtk-platformtheme
+Recommends: libcups2
 Conflicts: qt6
+Replaces: libqt6concurrent6 (<< 6.4.0),
+          libqt6core6 (<< 6.4.0),
+          libqt6dbus6 (<< 6.4.0),
+          libqt6gui6 (<< 6.4.0),
+          libqt6network6 (<< 6.4.0),
+          libqt6opengl6 (<< 6.4.0),
+          libqt6openglwidgets6 (<< 6.4.0),
+          libqt6printsupport6 (<< 6.4.0),
+          libqt6sql6 (<< 6.4.0),
+          libqt6sql6-ibase (<< 6.4.0),
+          libqt6sql6-mysql (<< 6.4.0),
+          libqt6sql6-odbc (<< 6.4.0),
+          libqt6sql6-psql (<< 6.4.0),
+          libqt6sql6-sqlite (<< 6.4.0),
+          libqt6test6 (<< 6.4.0),
+          libqt6widgets6 (<< 6.4.0),
+          libqt6xml6 (<< 6.4.0),
+          qt6-gtk-platformtheme (<< 6.4.0),
+          qt6-qpa-plugins (<< 6.4.0),
+          qt6-xdgdesktopportal-platformtheme (<< 6.4.0)
+Breaks:   libqt6concurrent6 (<< 6.4.0),
+          libqt6core6 (<< 6.4.0),
+          libqt6dbus6 (<< 6.4.0),
+          libqt6gui6 (<< 6.4.0),
+          libqt6network6 (<< 6.4.0),
+          libqt6opengl6 (<< 6.4.0),
+          libqt6openglwidgets6 (<< 6.4.0),
+          libqt6printsupport6 (<< 6.4.0),
+          libqt6sql6 (<< 6.4.0),
+          libqt6sql6-ibase (<< 6.4.0),
+          libqt6sql6-mysql (<< 6.4.0),
+          libqt6sql6-odbc (<< 6.4.0),
+          libqt6sql6-psql (<< 6.4.0),
+          libqt6sql6-sqlite (<< 6.4.0),
+          libqt6test6 (<< 6.4.0),
+          libqt6widgets6 (<< 6.4.0),
+          libqt6xml6 (<< 6.4.0),
+          qt6-gtk-platformtheme (<< 6.4.0),
+          qt6-qpa-plugins (<< 6.4.0),
+          qt6-xdgdesktopportal-platformtheme (<< 6.4.0)
 Description: Qt 6 Base files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -128,7 +166,7 @@ Provides: libqt6opengl6-dev,
           qmake6-bin,
           qt6-base-dev,
           qt6-base-dev-tools,
-          qt6-base-private-dev
+          qt6-base-private-dev,
           qmake6
 Depends: libfontconfig-dev,
          libgl-dev,
@@ -140,9 +178,18 @@ Depends: libfontconfig-dev,
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Breaks: qt6-base-dev-tools (<< 6.4)
-Replaces: qt6-base-dev-tools (<< 6.4)
-Recommends: libqt6opengl6-dev (= ${binary:Version})
+Breaks: libqt6opengl6-dev (<< 6.4.0),
+          qmake6-bin (<< 6.4.0),
+          qt6-base-dev (<< 6.4.0),
+          qt6-base-dev-tools (<< 6.4.0),
+          qt6-base-private-dev (<< 6.4.0),
+          qmake6 (<< 6.4.0)
+Replaces: libqt6opengl6-dev (<< 6.4.0),
+          qmake6-bin (<< 6.4.0),
+          qt6-base-dev (<< 6.4.0),
+          qt6-base-dev-tools (<< 6.4.0),
+          qt6-base-private-dev (<< 6.4.0),
+          qmake6 (<< 6.4.0)
 Description: Qt 6 Base files
  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/qt6-base.install b/debian/qt6-base.install
index 650176e..1ff08c1 100644
--- a/debian/qt6-base.install
+++ b/debian/qt6-base.install
@@ -1,54 +1,3 @@
 #!/usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6Concurrent.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6Core.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6DBus.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFSDeviceIntegration.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsGbmSupport.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsSupport.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6Gui.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6Network.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6OpenGL.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6OpenGLWidgets.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6PrintSupport.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6Sql.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6Test.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6Widgets.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6XcbQpa.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6Xml.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6*.so.*
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-emu-integration.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-kms-integration.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-x11-integration.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevkeyboardplugin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevmouseplugin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevtabletplugin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevtouchplugin.so
-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/networkinformation/libqnetworkmanager.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
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqlinuxfb.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqminimal.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqminimalegl.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqoffscreen.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqvkkhrdisplay.so
-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/platformthemes/libqgtk3.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platformthemes/libqxdgdesktopportal.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/printsupport/libcupsprintersupport.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/sqldrivers/libqsqlite.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/sqldrivers/libqsqlmysql.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/sqldrivers/libqsqlodbc.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/sqldrivers/libqsqlpsql.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
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/xcbglintegrations/libqxcb-glx-integration.so


More information about the Neon-commits mailing list