From 10f16ec7e74a4fd61200f259327a513401d2c552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= Date: Wed, 12 Jul 2023 14:17:40 -0300 Subject: [PATCH] No-op wrap-and-sort. --- debian/control | 116 ++++++++++++++-------------- debian/libqt6gui6.install | 16 ++-- debian/libqt6network6.install | 2 +- debian/libqt6opengl6.install | 6 +- debian/qt6-base-private-dev.install | 6 +- 5 files changed, 73 insertions(+), 73 deletions(-) diff --git a/debian/control b/debian/control index 409e83c..46c0866 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: qt6-base Priority: optional Maintainer: Debian Qt/KDE Maintainers -Uploaders: Patrick Franz +Uploaders: Patrick Franz , Build-Depends: cmake (>= 3.24~), debhelper-compat (= 13), default-libmysqlclient-dev, @@ -84,10 +84,10 @@ Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-base Package: libqt6core6 Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Provides: qt6-base-abi (= 6.4.2) -Depends: shared-mime-info, ${misc:Depends}, ${shlibs:Depends} -Recommends: qt6-translations-l10n +Pre-Depends: ${misc:Pre-Depends}, +Provides: qt6-base-abi (= 6.4.2), +Depends: shared-mime-info, ${misc:Depends}, ${shlibs:Depends}, +Recommends: qt6-translations-l10n, Description: Qt 6 core module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -97,8 +97,8 @@ Description: Qt 6 core module Package: libqt6concurrent6 Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 concurrent module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -109,8 +109,8 @@ Description: Qt 6 concurrent module Package: libqt6dbus6 Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 D-Bus module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -125,11 +125,11 @@ Description: Qt 6 D-Bus module Package: libqt6gui6 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~) -Recommends: qt6-gtk-platformtheme, qt6-qpa-plugins +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~), +Recommends: qt6-gtk-platformtheme, qt6-qpa-plugins, Description: Qt 6 GUI module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -139,8 +139,8 @@ Description: Qt 6 GUI module Package: qt6-qpa-plugins Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends} +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~), @@ -155,8 +155,8 @@ Description: Qt 6 QPA plugins Package: qt6-gtk-platformtheme Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 GTK+ 3 platform theme Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -167,8 +167,8 @@ Description: Qt 6 GTK+ 3 platform theme Package: qt6-xdgdesktopportal-platformtheme Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 XDG Desktop Portal platform theme Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -179,10 +179,10 @@ Description: Qt 6 XDG Desktop Portal platform theme Package: libqt6opengl6 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~) +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~), 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. @@ -196,8 +196,8 @@ Description: Qt 6 OpenGL module Package: libqt6openglwidgets6 Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 OpenGL widgets module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -213,10 +213,10 @@ Description: Qt 6 OpenGL widgets module Package: libqt6network6 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~) +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. @@ -227,8 +227,8 @@ Description: Qt 6 network module Package: libqt6sql6 Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, 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 @@ -240,8 +240,8 @@ Description: Qt 6 SQL module Package: libqt6sql6-mysql Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 MySQL database driver This package contains the MySQL plugin for Qt 6. . @@ -251,8 +251,8 @@ Description: Qt 6 MySQL database driver Package: libqt6sql6-odbc Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 ODBC database driver This package contains the ODBC plugin for Qt 6. . @@ -262,8 +262,8 @@ Description: Qt 6 ODBC database driver Package: libqt6sql6-psql Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 PostgreSQL database driver This package contains the PostgreSQL plugin for Qt 6. . @@ -273,8 +273,8 @@ Description: Qt 6 PostgreSQL database driver Package: libqt6sql6-sqlite Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 SQLite 3 database driver This package contains the SQLite 3 plugin for Qt 6. . @@ -284,8 +284,8 @@ Description: Qt 6 SQLite 3 database driver Package: libqt6sql6-ibase Architecture: kfreebsd-any linux-any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 Firebird database driver This package contains the Firebird plugin for Qt 6. . @@ -295,8 +295,8 @@ Description: Qt 6 Firebird database driver Package: libqt6test6 Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 test module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -307,8 +307,8 @@ Description: Qt 6 test module Package: libqt6widgets6 Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 widgets module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -318,8 +318,8 @@ Description: Qt 6 widgets module Package: libqt6xml6 Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 XML module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -330,9 +330,9 @@ Description: Qt 6 XML module Package: libqt6printsupport6 Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: libcups2 +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, +Recommends: libcups2, Description: Qt 6 print support module Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -363,9 +363,9 @@ Depends: libgl-dev, qt6-base-dev-tools (= ${binary:Version}), qt6-qpa-plugins (= ${binary:Version}), ${misc:Depends}, -Breaks: libqt6opengl6-dev (<< 6.3.1+dfsg-12~) -Replaces: libqt6opengl6-dev (<< 6.3.1+dfsg-12~) -Provides: libqt6opengl6-dev +Breaks: libqt6opengl6-dev (<< 6.3.1+dfsg-12~), +Replaces: libqt6opengl6-dev (<< 6.3.1+dfsg-12~), +Provides: libqt6opengl6-dev, Description: Qt 6 base 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. @@ -398,8 +398,8 @@ Package: qt6-base-dev-tools Architecture: any Multi-Arch: foreign Section: devel -Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} -Suggests: cmake +Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, +Suggests: cmake, 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. @@ -415,7 +415,7 @@ Package: qt6-base-examples Architecture: any Multi-Arch: same Section: misc -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 base examples Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. @@ -426,7 +426,7 @@ Package: qmake6-bin Architecture: any Multi-Arch: foreign Section: devel -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Qt 6 qmake Makefile generator tool — binary file 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 d82783d..efeeed5 100755 --- a/debian/libqt6gui6.install +++ b/debian/libqt6gui6.install @@ -1,21 +1,21 @@ #!/usr/bin/dh-exec -usr/lib/${DEB_HOST_MULTIARCH}/libQt6Gui.so.* -usr/lib/${DEB_HOST_MULTIARCH}/libQt6XcbQpa.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 [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevkeyboardplugin.so [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevmouseplugin.so [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevtabletplugin.so [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqevdevtouchplugin.so [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqlibinputplugin.so +[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqlinuxfb.so +[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqvkkhrdisplay.so +usr/lib/${DEB_HOST_MULTIARCH}/libQt6Gui.so.* +usr/lib/${DEB_HOST_MULTIARCH}/libQt6XcbQpa.so.* usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/generic/libqtslibplugin.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 -[linux-any] 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/libqoffscreen.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/xcbglintegrations/libqxcb-egl-integration.so +usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/xcbglintegrations/libqxcb-glx-integration.so diff --git a/debian/libqt6network6.install b/debian/libqt6network6.install index 9b793de..b061274 100755 --- a/debian/libqt6network6.install +++ b/debian/libqt6network6.install @@ -1,6 +1,6 @@ #!/usr/bin/dh-exec +[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/networkinformation/libqnetworkmanager.so usr/lib/${DEB_HOST_MULTIARCH}/libQt6Network.so.* usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/networkinformation/libqglib.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/libqt6opengl6.install b/debian/libqt6opengl6.install index 902bc56..d1e3755 100755 --- a/debian/libqt6opengl6.install +++ b/debian/libqt6opengl6.install @@ -1,11 +1,11 @@ #!/usr/bin/dh-exec -usr/lib/${DEB_HOST_MULTIARCH}/libQt6OpenGL.so.* -usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFSDeviceIntegration.so.* [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsGbmSupport.so.* [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFsKmsSupport.so.* -usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-emu-integration.so [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so [linux-any] usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-kms-integration.so +usr/lib/${DEB_HOST_MULTIARCH}/libQt6EglFSDeviceIntegration.so.* +usr/lib/${DEB_HOST_MULTIARCH}/libQt6OpenGL.so.* +usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-emu-integration.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/egldeviceintegrations/libqeglfs-x11-integration.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqeglfs.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/platforms/libqminimalegl.so diff --git a/debian/qt6-base-private-dev.install b/debian/qt6-base-private-dev.install index f187e39..9202e8d 100755 --- a/debian/qt6-base-private-dev.install +++ b/debian/qt6-base-private-dev.install @@ -1,14 +1,14 @@ #!/usr/bin/dh-exec +[linux-any] usr/include/${DEB_HOST_MULTIARCH}/qt6/QtEglFsKmsGbmSupport/6.*/* +[linux-any] usr/include/${DEB_HOST_MULTIARCH}/qt6/QtEglFsKmsSupport/6.*/* +[linux-any] usr/include/${DEB_HOST_MULTIARCH}/qt6/QtKmsSupport/6.*/* usr/include/${DEB_HOST_MULTIARCH}/qt6/QtCore/6.*/* usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDBus/6.*/* usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDeviceDiscoverySupport/6.*/* usr/include/${DEB_HOST_MULTIARCH}/qt6/QtEglFSDeviceIntegration/6.*/* -[linux-any] usr/include/${DEB_HOST_MULTIARCH}/qt6/QtEglFsKmsGbmSupport/6.*/* -[linux-any] usr/include/${DEB_HOST_MULTIARCH}/qt6/QtEglFsKmsSupport/6.*/* usr/include/${DEB_HOST_MULTIARCH}/qt6/QtFbSupport/6.*/* usr/include/${DEB_HOST_MULTIARCH}/qt6/QtGui/6.*/* usr/include/${DEB_HOST_MULTIARCH}/qt6/QtInputSupport/6.*/* -[linux-any] usr/include/${DEB_HOST_MULTIARCH}/qt6/QtKmsSupport/6.*/* usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetwork/6.*/* usr/include/${DEB_HOST_MULTIARCH}/qt6/QtOpenGL/6.*/* usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPrintSupport/6.*/*