[neon/qt6/qt6-3d/Neon/release] debian: update to salsa/experimental qt 6.4.1 and qt_sixy it
Jonathan Esk-Riddell
null at kde.org
Tue Dec 6 15:27:37 GMT 2022
Git commit 8785ee1c665b079a702f11fe74d8a472bdcf34dc by Jonathan Esk-Riddell.
Committed on 06/12/2022 at 15:27.
Pushed by jriddell into branch 'Neon/release'.
update to salsa/experimental qt 6.4.1 and qt_sixy it
M +87 -3 debian/changelog
M +154 -30 debian/control
M +19 -0 debian/qt6-3d-dev.install
M +1 -0 debian/qt6-3d.install
M +2 -1 debian/rules
M +10 -4 debian/source/lintian-overrides
https://invent.kde.org/neon/qt6/qt6-3d/commit/8785ee1c665b079a702f11fe74d8a472bdcf34dc
diff --git a/debian/changelog b/debian/changelog
index 32d14f4..96b3a4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,92 @@
-qt6-3d (6.2.3+dfsg-0neon) UNRELEASED; urgency=medium
+qt6-3d (6.4.1+dfsg-1) experimental; urgency=medium
- * New release
+ [ Patrick Franz ]
+ * New upstream release (6.4.1).
+ * Bump Qt B-Ds to 6.4.1.
+
+ -- Patrick Franz <deltaone at debian.org> Thu, 17 Nov 2022 20:49:51 +0100
+
+qt6-3d (6.4.0+dfsg-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Enable link time optimization (Closes: #1015614).
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 13 Nov 2022 11:50:31 +0100
+
+qt6-3d (6.4.0+dfsg-1) experimental; urgency=medium
+
+ [ Lu YaNing ]
+ * New upstream release (6.4.0).
+ * Bump Qt B-Ds to 6.4.0.
+ * Update install files.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 29 Oct 2022 13:21:06 +0200
+
+qt6-3d (6.3.1+dfsg-4) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Increase CMake verbosity level, allowing to check more details of the
+ build.
+ * Add qt6-multimedia-dev as a Build Dependency, which is an optional one.
+ * Bump minimum CMake version in order to get pkg-config's .pc files.
+
+ [ Pino Toscano ]
+ * Mark a Linux-only symbol as such.
+
+ -- Pino Toscano <pino at debian.org> Tue, 06 Sep 2022 23:14:45 +0200
+
+qt6-3d (6.3.1+dfsg-3) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Update lintian-overrides.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 16 Aug 2022 23:39:50 +0200
+
+qt6-3d (6.3.1+dfsg-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:22:05 +0200
+
+qt6-3d (6.3.1+dfsg-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.3.1).
+ * Bump Qt B-Ds to 6.3.1.
+ * Bump Standards-Version to 4.6.1 (no changes needed).
+ * Update list of installed files.
+ * Update symbols from buildlogs.
+ * Update lintian-overrides.
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 17 Jul 2022 11:17:46 +0200
+
+qt6-3d (6.3.0+dfsg-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.3.0).
+ * Bump Qt B-Ds to 6.3.0.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 15 Jun 2022 17:49:43 +0200
+
+qt6-3d (6.2.4+dfsg-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:06:08 +0200
+
+qt6-3d (6.2.4+dfsg-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.2.4).
+ * Bump Qt B-Ds to 6.2.4.
+ * Update symbols from buildlogs.
- -- Jonathan Riddell <jr at jriddell.org> Tue, 01 Mar 2022 11:44:13 +0000
+ -- Patrick Franz <deltaone at debian.org> Wed, 30 Mar 2022 21:41:04 +0200
qt6-3d (6.2.2+dfsg-3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 63b6fe2..3a3600d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,24 @@ Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Patrick Franz <deltaone at debian.org>, Lu YaNing <dluyaning at gmail.com>
-Build-Depends: cmake (>= 3.18~),
+Build-Depends: cmake (>= 3.24~),
debhelper-compat (= 13),
libassimp-dev (>= 5.1.1~),
libgl-dev,
libgl1-mesa-dri <!nocheck>,
+ libqt6shadertools6-dev (>= 6.4.1~),
libssl-dev,
libvulkan-dev [linux-any],
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.2.3),
- qt6-declarative-dev (>= 6.2.3),
+ qt6-base-dev (>= 6.4.1+dfsg~),
+ qt6-declarative-dev (>= 6.4.1+dfsg~),
+ qt6-multimedia-dev (>= 6.4.1~),
xauth <!nocheck>,
xvfb <!nocheck>,
zlib1g-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
Homepage: https://www.qt.io/developers/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-3d
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-3d.git
@@ -27,32 +29,10 @@ Rules-Requires-Root: no
Package: qt6-3d
Architecture: any
Section: kde
-Provides: libqt63danimation6,
- libqt63dcore6,
- libqt63dextras6,
- libqt63dinput6,
- libqt63dlogic6,
- libqt63dquick6,
- libqt63dquickanimation6,
- libqt63dquickextras6,
- libqt63dquickinput6,
- libqt63dquickrender6,
- libqt63dquickscene2d6,
- libqt63drender6,
- qml6-module-qt3d-animation,
- qml6-module-qt3d-core,
- qml6-module-qt3d-extras,
- qml6-module-qt3d-input,
- qml6-module-qt3d-logic,
- qml6-module-qt3d-render,
- qml6-module-qtquick-scene2d,
- qml6-module-qtquick-scene3d,
- qt6-3d-assimpsceneimport-plugin,
- qt6-3d-defaultgeometryloader-plugin,
- qt6-3d-gltfsceneio-plugin,
- qt6-3d-scene2d-plugin
+X-Neon-MergedPackage: true
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
+Depends: libqt63dcore6 (= ${binary:Version}),
+ ${misc:Depends},
${shlibs:Depends}
Description: Qt 6 3D Core library
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -63,7 +43,7 @@ Description: Qt 6 3D Core library
Package: qt6-3d-dev
Architecture: any
Section: kde
-Provides: qt6-3d-dev
+X-Neon-MergedPackage: true
Depends: qt6-3d (= ${binary:Version}), qt6-base-dev, ${misc:Depends}
Description: Qt 6 3D - development files
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -71,3 +51,147 @@ Description: Qt 6 3D - development files
.
This package contains the header development files used for building Qt 6
applications using Qt 3D library.
+
+Package: libqt63dcore6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt63dquick6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt63dquickrender6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt63dinput6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt63drender6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt63dlogic6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt63dquickinput6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt63dquickextras6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt63dextras6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt63dquickscene2d6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt63danimation6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt63dquickanimation6
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-3d-gltfsceneio-plugin
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-3d-assimpsceneimport-plugin
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-3d-defaultgeometryloader-plugin
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-3d-scene2d-plugin
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qt3d-core
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qt3d-animation
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qt3d-extras
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qt3d-input
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qt3d-logic
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qt3d-render
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtquick-scene3d
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtquick-scene2d
+Architecture: all
+Depends: qt6-3d
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-3d-dev.install b/debian/qt6-3d-dev.install
index 56dc09c..5aa5dce 100644
--- a/debian/qt6-3d-dev.install
+++ b/debian/qt6-3d-dev.install
@@ -622,9 +622,16 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt63DRenderConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt63DRenderConfigVersion.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt63DRenderConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt63DRenderDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt63DRenderPlugins.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt63DRenderTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt63DRenderTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt63DRenderVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6RhiRendererPluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6RhiRendererPluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6RhiRendererPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6RhiRendererPluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6RhiRendererPluginTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6RhiRendererPluginTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/libQt63DAnimation.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt63DAnimation.so
usr/lib/${DEB_HOST_MULTIARCH}/libQt63DCore.prl
@@ -661,6 +668,18 @@ usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt63dquickinput_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt63dquickrender_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt63dquickscene2d_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt63drender_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DAnimation.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DCore.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DExtras.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DInput.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DLogic.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DQuick.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DQuickAnimation.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DQuickExtras.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DQuickInput.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DQuickRender.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DQuickScene2D.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt63DRender.pc
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3danimation.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dcore.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dextras.pri
diff --git a/debian/qt6-3d.install b/debian/qt6-3d.install
index 2c03ca4..6b7bb3e 100644
--- a/debian/qt6-3d.install
+++ b/debian/qt6-3d.install
@@ -13,6 +13,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt63DRender.so.*
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/geometryloaders/libdefaultgeometryloader.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/geometryloaders/libgltfgeometryloader.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/renderers/libopenglrenderer.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/renderers/librhirenderer.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/renderplugins/libscene2d.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/sceneparsers/libassimpsceneimport.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/sceneparsers/libgltfsceneexport.so
diff --git a/debian/rules b/debian/rules
index 149018d..e2cde0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,14 @@
#!/usr/bin/make -f
include /usr/share/dpkg/architecture.mk
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
%:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
override_dh_auto_configure:
dh_auto_configure -- \
+ --log-level=STATUS \
-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
execute_after_dh_auto_install:
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 72a14d4..dcc2b9b 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,10 +1,16 @@
# False positive: files under JSON license are not actually present
# (they would be at i.e. src/3rdparty/assimp/contrib/rapidjson/bin/jsonchecker/ if they were)
-qt6-3d source: license-problem-json-evil src/3rdparty/assimp/src/contrib/rapidjson/license.txt
+qt6-3d source: license-problem-json-evil [src/3rdparty/assimp/src/contrib/rapidjson/license.txt]
# The file is not shipped, neither is the source code next to it built,
# but the contents of the chm are entirely generated from the source
# code.
-qt6-3d source: source-contains-prebuilt-ms-help-file src/3rdparty/assimp/src/contrib/zlib/contrib/dotzlib/DotZLib.chm
-qt6-3d source: source-contains-prebuilt-ms-help-file src/3rdparty/assimp/src/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm
-qt6-3d source: source-contains-prebuilt-ms-help-file src/3rdparty/assimp/src/doc/AssimpDoc_Html/AssimpDoc.chm
+qt6-3d source: source-contains-prebuilt-ms-help-file [src/3rdparty/assimp/src/contrib/zlib/contrib/dotzlib/DotZLib.chm]
+qt6-3d source: source-contains-prebuilt-ms-help-file [src/3rdparty/assimp/src/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm]
+qt6-3d source: source-contains-prebuilt-ms-help-file [src/3rdparty/assimp/src/doc/AssimpDoc_Html/AssimpDoc.chm]
+
+# to make lintian/ftp-master happy :-/
+qt6-3d source: license-problem-json-evil src/3rdparty/assimp/src/contrib/rapidjson/license.txt
+qt6-3d source: source-contains-prebuilt-ms-help-file src/3rdparty/assimp/src/contrib/zlib/contrib/dotzlib/DotZLib.chm
+qt6-3d source: source-contains-prebuilt-ms-help-file src/3rdparty/assimp/src/doc/AssimpCmdDoc_Html/AssimpCmdDoc.chm
+qt6-3d source: source-contains-prebuilt-ms-help-file src/3rdparty/assimp/src/doc/AssimpDoc_Html/AssimpDoc.chm
More information about the Neon-commits
mailing list