[neon/qt6/qt6-scxml/Neon/release] debian: sync to debian

Carlos De Maine null at kde.org
Tue Oct 24 04:02:34 BST 2023


Git commit 9b0573b980f786d3f7434cf19f66be2e24fce741 by Carlos De Maine.
Committed on 24/10/2023 at 05:02.
Pushed by carlosdem into branch 'Neon/release'.

sync to debian

M  +40   -1    debian/control
A  +1    -0    debian/qt6-scxml-doc.install
M  +20   -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-scxml/-/commit/9b0573b980f786d3f7434cf19f66be2e24fce741

diff --git a/debian/control b/debian/control
index aced686..843b6b5 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,10 @@ Build-Depends: cmake,
                qt6-declarative-dev (>= 6.4.2+dfsg~),
                xauth <!nocheck>,
                xvfb <!nocheck>
-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-scxml
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-scxml.git
@@ -58,6 +61,24 @@ Description: Qt 6 SCXML - development files
  .
  This package contains the development files for Qt 6 SCXML.
 
+Package: qt6-scxml-doc
+Architecture: all
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-base-doc, qt6-scxml-dev (= ${binary:Version}), ${misc:Depends}
+Description: Qt 6 SCXML - 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.
+ .
+ The Qt SCXML module provides functionality to create state
+ machines from SCXML files. This includes both dynamically
+ creating state machines (loading the SCXML file and instantiating
+ states and transitions) and generating a C++ file that has a class
+ implementing the state machine. It also contains functionality
+ to support data models and executable content.
+ .
+ This package contains the documentation files for Qt 6 SCXML.
+
 Package: libqt6scxml6
 Architecture: all
 Depends: qt6-scxml
@@ -99,3 +120,21 @@ Architecture: all
 Depends: qt6-scxml
 Description: Dummy transitional
  Transitional dummy package.
+
+Package: qt6-scxml-doc-dev
+Architecture: all
+Depends: qt6-scxml-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-scxml-doc-html
+Architecture: all
+Depends: qt6-scxml-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-scxml-examples
+Architecture: all
+Depends: qt6-scxml-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-scxml-doc.install b/debian/qt6-scxml-doc.install
new file mode 100644
index 0000000..6a0b95c
--- /dev/null
+++ b/debian/qt6-scxml-doc.install
@@ -0,0 +1 @@
+usr/share/qt6/doc
diff --git a/debian/rules b/debian/rules
index 0d56bff..5c1d581 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,32 @@ 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))
+	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
+
 %:
 	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) \
+		$(cmake_extra_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