[neon/qt6/qt6-base/Neon/release] debian: reorganise
Carlos De Maine
null at kde.org
Sat Dec 9 07:03:09 GMT 2023
Git commit dee8384bcc05f4daf8ed46d7664dbb6dd2786267 by Carlos De Maine.
Committed on 09/12/2023 at 08:03.
Pushed by carlosdem into branch 'Neon/release'.
reorganise
M +60 -110 debian/control
M +10 -6 debian/qt6-base.links
M +7 -1 debian/source/lintian-overrides
https://invent.kde.org/neon/qt6/qt6-base/-/commit/dee8384bcc05f4daf8ed46d7664dbb6dd2786267
diff --git a/debian/control b/debian/control
index 682b212..a8a85e4 100644
--- a/debian/control
+++ b/debian/control
@@ -117,30 +117,56 @@ Package: qt6-base
Architecture: any
Section: kde
X-Neon-MergedPackage: true
-Pre-Depends: ${misc:Pre-Depends}
-Provides: qt6-base-private-abi (= 6.6.1),
+Pre-Depends: ${misc:Pre-Depends},
Depends: fontconfig,
shared-mime-info,
${misc:Depends},
${shlibs:Depends}
+Provides: qt6-base-private-abi (= 6.6.1),
+ libqt6concurrent6,
+ libqt6core6,
+ libqt6dbus6,
+ libqt6gui6,
+ libqt6network6,
+ libqt6opengl6,
+ libqt6openglwidgets6,
+ libqt6sql6-ibase,
+ libqt6sql6-mysql,
+ libqt6sql6-odbc,
+ libqt6sql6-psql,
+ libqt6sql6-sqlite,
+ libqt6sql6,
+ libqt6test6,
+ libqt6widgets6,
+ libqt6xml6,
+ qt6-gtk-platformtheme,
+ qt6-qpa-plugins,
+ qt6-xdgdesktopportal-platformtheme,
+Replaces: libqt6concurrent6,
+ libqt6core6,
+ libqt6dbus6,
+ libqt6gui6,
+ libqt6network6,
+ libqt6opengl6,
+ libqt6openglwidgets6,
+ libqt6sql6-ibase,
+ libqt6sql6-mysql,
+ libqt6sql6-odbc,
+ libqt6sql6-psql,
+ libqt6sql6-sqlite,
+ libqt6sql6,
+ libqt6test6,
+ libqt6widgets6,
+ libqt6xml6,
+ qt6-gtk-platformtheme,
+ qt6-qpa-plugins,
+ qt6-xdgdesktopportal-platformtheme,
Recommends: libcups2,
libqt6sql6-sqlite | libqt6sql6-mysql | libqt6sql6-odbc | libqt6sql6-psql | libqt6sql6-ibase,
qt6-gtk-platformtheme,
qt6-qpa-plugins,
qt6-wayland,
qt6-translations-l10n
-Breaks: libqt6core6 (<< 6.6.0),
- libqt6gui6 (<< 6.6.0),
- libqt6network6 (<< 6.6.0),
- libqt6opengl6 (<< 6.6.0),
- qt6-gtk-platformtheme (<< 6.6.0),
- qt6-qpa-plugins (<< 6.6.0)
-Replaces: libqt6core6 (<< 6.6.0),
- libqt6gui6 (<< 6.6.0),
- libqt6network6 (<< 6.6.0),
- libqt6opengl6 (<< 6.6.0),
- qt6-gtk-platformtheme (<< 6.6.0),
- qt6-qpa-plugins (<< 6.6.0)
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.
@@ -151,105 +177,31 @@ Package: qt6-base-dev
Architecture: any
Section: kde
X-Neon-MergedPackage: true
-Depends: default-libmysqlclient-dev,
- firebird-dev,
- glslang-tools,
-# glslc,
- libatspi2.0-dev,
- libb2-dev,
- libbrotli-dev,
- libcups2-dev,
- libdbus-1-dev,
- libdouble-conversion-dev,
- libdrm-dev,
- libegl-dev,
- libfontconfig-dev,
- libfreetype-dev,
- libgbm-dev,
- libgcc-12-dev,
- libgif-dev,
+Pre-Depends: ${misc:Pre-Depends},
+Depends: libfontconfig-dev,
libgl-dev,
- libgl1-mesa-dev,
- libgles-dev,
- libglib2.0-dev,
- libglu1-mesa-dev | libglu-dev,
libglx-dev,
- libgtk-3-dev,
- libharfbuzz-dev,
- libice-dev,
- libicu-dev,
libinput-dev,
- libjpeg-dev,
- libkrb5-dev,
- liblttng-ust-dev,
- libmd4c-dev,
- libmd4c-html0-dev,
- libmtdev-dev,
libopengl-dev,
- libpcre2-dev,
- libpng-dev,
- libpq-dev,
- libproxy-dev,
- libsctp-dev,
- libsqlite3-dev,
- libssl-dev,
- libsystemd-dev,
- libts-dev,
- liblttng-ust-dev,
- libturbojpeg0-dev,
- libudev-dev,
libvulkan-dev,
- libwayland-dev,
- libx11-dev,
- libx11-xcb-dev,
- libxcb1-dev,
- libxcb-cursor-dev,
- libxcb-composite0-dev,
- libxcb-damage0-dev,
- libxcb-dpms0-dev,
- libxcb-dri2-0-dev,
- libxcb-dri3-dev,
- libxcb-ewmh-dev,
- libxcb-glx0-dev,
- libxcb-icccm4-dev,
- libxcb-image0-dev,
- libxcb-keysyms1-dev,
- libxcb-present-dev,
- libxcb-randr0-dev,
- libxcb-record0-dev,
- libxcb-render-util0-dev,
- libxcb-render0-dev,
- libxcb-res0-dev,
- libxcb-screensaver0-dev,
- libxcb-shape0-dev,
- libxcb-shm0-dev,
- libxcb-sync-dev,
- libxcb-util-dev,
- libxcb-xfixes0-dev,
- libxcb-xf86dri0-dev,
- libxcb-xinerama0-dev,
- libxcb-xinput-dev,
- libxcb-xkb-dev,
- libxcb-xrm-dev,
- libxcb-xv0-dev,
- libxcb-xvmc0-dev,
- libxcb-xtest0-dev,
- libxext-dev,
- libxfixes-dev,
- libxi-dev,
libxkbcommon-dev,
- libxkbcommon-x11-dev,
- libxrender-dev,
- libzstd-dev,
- python3:any,
qt6-base (= ${binary:Version}),
- qt6-base-dev-tools,
- unixodbc-dev,
- zlib1g-dev,
${misc:Depends},
${shlibs:Depends},
-Recommends: libqt6opengl6-dev (= ${binary:Version})
-Suggests: cmake
+Provides: qmake6,
+ qmake6-bin,
+ qt6-base-dev-tools,
+ qt6-base-dev,
+ qt6-base-doc-dev,
+ qt6-base-examples,
+ qt6-base-private-dev,
+Replaces: qmake6,
+ qmake6-bin,
+ qt6-base-dev-tools,
+ qt6-base-dev,
+ qt6-base-doc-dev,
+ qt6-base-examples,
+ qt6-base-private-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.
@@ -266,7 +218,8 @@ Section: kde
X-Neon-MergedPackage: true
Depends: qt6-base-dev,
${misc:Depends}
-Suggests: cmake
+Provides: qt6-base-doc-html,
+Replaces: qt6-base-doc-html,
Description: Qt 6 base documentation files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -406,20 +359,19 @@ Description: Dummy transitional
Package: qmake6
Architecture: all
-Depends: qt6-base, ${misc:Depends}
+Depends: qt6-base-dev, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qmake6-bin
Architecture: all
-Depends: qt6-base, ${misc:Depends}
+Depends: qt6-base-dev, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qt6-base-doc-dev
Architecture: all
Depends: qt6-base-dev, ${misc:Depends}
-Provides: qt6-base-dev
Description: Dummy transitional
Transitional dummy package.
@@ -432,13 +384,11 @@ Description: Dummy transitional
Package: qt6-base-private-dev
Architecture: all
Depends: qt6-base-dev, ${misc:Depends}
-Provides: qt6-base-dev
Description: Dummy transitional
Transitional dummy package.
Package: qt6-base-dev-tools
Architecture: all
Depends: qt6-base-dev, ${misc:Depends}
-Provides: qt6-base-dev
Description: Dummy transitional
Transitional dummy package.
diff --git a/debian/qt6-base.links b/debian/qt6-base.links
index 77728e7..bbcd442 100644
--- a/debian/qt6-base.links
+++ b/debian/qt6-base.links
@@ -1,10 +1,14 @@
-# On public path we want qmake6.
-# On public path we want qtpaths6.
+## qmake6.links
# qmake and qmake6 are identical files. We want people to use qmake6,
-# qtpaths and qtpaths6 are identical files. We want people to use qtpaths6,
# so we do not install qmake. Instead, qmake is a symbolic link pointing to qmake6.
-# so we do not install qtpaths. Instead, qtpaths is a symbolic link pointing to qtpaths6.
-usr/lib/qt6/bin/qmake6 usr/bin/qmake6
usr/lib/qt6/bin/qmake6 usr/lib/qt6/bin/qmake
-usr/lib/qt6/bin/qtpaths6 usr/bin/qtpaths6
+# On public path we want qmake6.
+usr/lib/qt6/bin/qmake6 usr/bin/qmake6
+
+## qt6-base-dev-tools.links
+# qtpaths and qtpaths6 are identical files. We want people to use qtpaths6,
+# so we do not install qtpaths. Instead, qtpaths is a symbolic link pointing to qtpaths6.
usr/lib/qt6/bin/qtpaths6 usr/lib/qt6/bin/qtpaths
+# On public path we want qtpaths6.
+usr/lib/qt6/bin/qtpaths6 usr/bin/qtpaths6
+
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 85cd787..45e2b5c 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,4 +1,5 @@
# Binary data crafted to be used during tests
+qt6-base source: source-is-missing [tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so]
qt6-base source: binary-with-bad-dynamic-table [tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so]
# These are not static libraries, despite the .a extension
@@ -9,7 +10,12 @@ qt6-base source: unpack-message-for-source ar failed for tests/auto/corelib/io/q
qt6-base source: unpack-message-for-source ar failed for tests/auto/corelib/io/qdir/types/b.a
qt6-base source: unpack-message-for-source ar failed for tests/auto/corelib/io/qdir/types/c.a
+# Override some source-is-missing
+qt6-base source: source-is-missing [tests/auto/corelib/text/qtextboundaryfinder/data/WordBreakTest.html]
+qt6-base source: source-is-missing [tests/manual/examples/widgets/richtext/textedit/example.html]
+
+
# Override some source-is-missing
qt6-base source: source-is-missing tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so
-qt6-base source: license-problem-non-free-RFC tests/auto/corelib/text/qbytearray_large/rfc3252.txt
\ No newline at end of file
+qt6-base source: license-problem-non-free-RFC tests/auto/corelib/text/qbytearray_large/rfc3252.txt
More information about the Neon-commits
mailing list