[neon/qt6/qt6-3d/Neon/release] debian: sync to debian
Carlos De Maine
null at kde.org
Tue Oct 24 03:24:38 BST 2023
Git commit d50c85a89510cfba2c942d8dccf05cdcd3e5bc8b by Carlos De Maine.
Committed on 24/10/2023 at 04:24.
Pushed by carlosdem into branch 'Neon/release'.
sync to debian
M +36 -2 debian/control
M +0 -115 debian/not-installed
A +1 -0 debian/qt6-3d-doc.install
M +17 -2 debian/rules
https://invent.kde.org/neon/qt6/qt6-3d/-/commit/d50c85a89510cfba2c942d8dccf05cdcd3e5bc8b
diff --git a/debian/control b/debian/control
index 969e14e..bff0576 100644
--- a/debian/control
+++ b/debian/control
@@ -17,11 +17,15 @@ Build-Depends: cmake,
qt6-base-dev (>= 6.4.1+dfsg~),
qt6-declarative-dev (>= 6.4.1+dfsg~),
qt6-multimedia-dev (>= 6.4.1~),
+ qt6-quick3d-dev,
qt6-shadertools-dev (>= 6.4.1~),
xauth <!nocheck>,
xvfb <!nocheck>,
zlib1g-dev
-Standards-Version: 4.6.1
+Build-Depends-Indep: qt6-base-dev (>= 6.4~) <!nodoc>,
+ qt6-documentation-tools (>= 6.4~) <!nodoc>,
+ qt6-base-doc (>= 6.4~) <!nodoc>,
+Standards-Version: 4.6.2
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
@@ -53,6 +57,18 @@ Description: Qt 6 3D - development files
This package contains the header development files used for building Qt 6
applications using Qt 3D library.
+Package: qt6-3d-doc
+Architecture: all
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-3d-dev (= ${binary:Version}), qt6-base-doc, ${misc:Depends}
+Description: Qt 6 3D - 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.
+ .
+ This package contains the documentation files used to help build Qt 6
+ applications using Qt 3D library.
+
Package: libqt63dcore6
Architecture: all
Depends: qt6-3d
@@ -180,7 +196,7 @@ Description: Dummy transitional
Transitional dummy package.
Package: qml6-module-qt3d-render
-Architecture: all
+Architecture: any
Depends: qt6-3d
Description: Dummy transitional
Transitional dummy package.
@@ -196,3 +212,21 @@ Architecture: all
Depends: qt6-3d
Description: Dummy transitional
Transitional dummy package.
+
+Package: qt6-3d-doc-dev
+Architecture: all
+Depends: qt6-3d-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-3d-doc-html
+Architecture: all
+Depends: qt6-3d-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-3d-examples
+Architecture: all
+Depends: qt6-3d-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/not-installed b/debian/not-installed
index 9f3dfc3..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,115 +0,0 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DAnimation/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DCore/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DExtras/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DInput/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DLogic/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DQuick/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DQuickAnimation/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DQuickExtras/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DQuickInput/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DQuickRender/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DQuickScene2D/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/Qt3DRender/6.*
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6AssimpSceneImportPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6AssimpSceneImportPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6AssimpSceneImportPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6AssimpSceneImportPluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6AssimpSceneImportPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6DefaultGeometryLoaderPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6DefaultGeometryLoaderPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6DefaultGeometryLoaderPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6DefaultGeometryLoaderPluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6DefaultGeometryLoaderPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFGeometryLoaderPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFGeometryLoaderPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFGeometryLoaderPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFGeometryLoaderPluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFGeometryLoaderPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneExportPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneExportPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneExportPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneExportPluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneExportPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneImportPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneImportPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneImportPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneImportPluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneImportPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6OpenGLRendererPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6OpenGLRendererPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6OpenGLRendererPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6OpenGLRendererPluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6OpenGLRendererPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6Scene2DPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6Scene2DPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6Scene2DPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6Scene2DPluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6Scene2DPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6DefaultGeometryLoaderPluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFGeometryLoaderPluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneExportPluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6GLTFSceneImportPluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6OpenGLRendererPluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6Scene2DPluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt63DRender/Qt6AssimpSceneImportPluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/Qt3DTestsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene2dpluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene2dpluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene2dpluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene2dpluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene2dpluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene3dpluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene3dpluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene3dpluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene3dpluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene3dpluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3danimationpluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3danimationpluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3danimationpluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3danimationpluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3danimationpluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dcorepluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dcorepluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dcorepluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dcorepluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dcorepluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dextraspluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dextraspluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dextraspluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dextraspluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dextraspluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dinputpluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dinputpluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dinputpluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dinputpluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dinputpluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dlogicpluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dlogicpluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dlogicpluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dlogicpluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dlogicpluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3drenderpluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3drenderpluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3drenderpluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3drenderpluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3drenderpluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene2dpluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtquickscene3dpluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3danimationpluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dcorepluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dextraspluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dinputpluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3dlogicpluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quick3drenderpluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3danimation_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dcore_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dextras_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dinput_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dlogic_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dquick_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dquickanimation_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dquickextras_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dquickinput_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dquickrender_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3dquickscene2d_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_3drender_private.pri
diff --git a/debian/qt6-3d-doc.install b/debian/qt6-3d-doc.install
new file mode 100644
index 0000000..8536ff4
--- /dev/null
+++ b/debian/qt6-3d-doc.install
@@ -0,0 +1 @@
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index e2cde0c..dba1943 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,29 @@ include /usr/share/dpkg/architecture.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
+# QT_HOST_PATH isn't passed in cross-builds
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+ extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
%:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
override_dh_auto_configure:
dh_auto_configure -- \
--log-level=STATUS \
- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+ $(extra_cmake_args)
+
+override_dh_auto_build-indep:
+ dh_auto_build -- docs
+
+override_dh_auto_install-indep:
+ DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
+ # Remove build path from index files.
+ find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
+ sed -i 's@$(CURDIR)/@@g' {} \;
-execute_after_dh_auto_install:
+execute_after_dh_auto_install-arch:
# Reproducible builds: remove build paths from .prl files
sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
More information about the Neon-commits
mailing list