[neon/qt6/qt6-quick3dphysics/Neon/release] debian: add docs

Carlos De Maine null at kde.org
Thu Oct 26 03:32:26 BST 2023


Git commit f6e32674b3337a3b11f45dc36a5c3c7d9b8df299 by Carlos De Maine.
Committed on 26/10/2023 at 04:32.
Pushed by carlosdem into branch 'Neon/release'.

add docs

M  +29   -0    debian/control
A  +1    -0    debian/qt6-quick3dphysics-doc.install
M  +18   -4    debian/rules

https://invent.kde.org/neon/qt6/qt6-quick3dphysics/-/commit/f6e32674b3337a3b11f45dc36a5c3c7d9b8df299

diff --git a/debian/control b/debian/control
index 9630282..1859026 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,9 @@ Build-Depends: cmake,
                qt6-qmltooling-quick3dprofiler-plugin,
                qt6-quick3d-dev,
                qt6-shadertools-dev,
+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-quick3dphysics
@@ -50,6 +53,20 @@ Description: Qt 6 Quick 3D Physics library
  .
  This package contains Qt 6 Quick 3D Physics development files.
 
+Package: qt6-quick3dphysics-doc
+Architecture: all
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-base-doc,
+         qt6-quick3dphysics-dev (= ${binary:Version}),
+         ${misc:Depends}
+Description: Qt 6 Quick 3D Physics library - 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.
+ .
+ This package contains the documentation files used to help build Qt 6
+ applications using Qt Quick 3D library.
+
 Package: libqt6quick3dphysics6
 Architecture: all
 Depends: qt6-quick3dphysics
@@ -74,6 +91,18 @@ Depends: qt6-quick3dphysics-dev
 Description: Dummy transitional
  Transitional dummy package.
 
+Package: qt6-quick3dphysics-doc-dev
+Architecture: all
+Depends: qt6-quick3dphysics-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-quick3dphysics-doc-html
+Architecture: all
+Depends: qt6-quick3dphysics-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
 Package: qt6-quick3dphysics-examples
 Architecture: all
 Depends: qt6-quick3dphysics-dev
diff --git a/debian/qt6-quick3dphysics-doc.install b/debian/qt6-quick3dphysics-doc.install
new file mode 100644
index 0000000..8536ff4
--- /dev/null
+++ b/debian/qt6-quick3dphysics-doc.install
@@ -0,0 +1 @@
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 1b48c75..a37b981 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,17 @@
 #!/usr/bin/make -f
+#export DH_VERBOSE = 1
 
+# Use already defined DEB_HOST_* variables.
 include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
-# cross-builds
+# QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-	extra_cmake_args += -DQT_HOST_PATH=/usr
+	cmake_extra_args += \
+		-DQT_HOST_PATH=/usr \
+		-DQT_HOST_PATH_CMAKE_DIR=/usr/lib/$(DEB_BUILD_MULTIARCH)/cmake \
+		-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
 endif
 
 %:
@@ -16,8 +21,17 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		--log-level=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-		$(extra_cmake_args)
+		$(cmake_extra_args)
 
-execute_after_dh_auto_install:
+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-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