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

[Carlos De Maine]

Git commit 19f8b656eb632d342681a877e57806c53826ad0f by Carlos De Maine.
Committed on 24/10/2023 at 04:11.
Pushed by carlosdem into branch 'Neon/release'.

sync to debian

M  +42   -3    debian/control
M  +0    -2    debian/not-installed
A  +1    -0    debian/qt6-serialbus-doc.install
M  +17   -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-serialbus/-/commit/19f8b656eb632d342681a877e57806c53826ad0f

diff --git a/debian/control b/debian/control
index 23be3bd..a288412 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,10 @@ Build-Depends: cmake,
                pkg-kde-tools,
                qt6-base-dev (>= 6.4.2+dfsg~),
                qt6-serialport-dev (>= 6.4.2~)
-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-serialbus
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-serialbus.git
@@ -60,20 +63,56 @@ Description: Qt 6 Serial Bus development files
  This package contains the header development files used for building Qt 6
  applications using qtserialbus.
 
+Package: qt6-serialbus-doc
+Architecture: all
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-base-doc,
+         qt6-serialbus-dev (= ${binary:Version}),
+         ${misc:Depends}
+Description: Qt 6 Serial Bus 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 6 Serial Bus module provides the Qt module for general purpose
+ serial bus access, support for CAN and potentially other
+ serial buses.
+ .
+ This package contains the documentation files to help build Qt 6
+ applications using qtserialbus.
+
 Package: libqt6serialbus6
 Architecture: all
 Depends: qt6-serialbus
 Description: Dummy transitional
  Transitional dummy package.
 
+Package: libqt6serialbus6-bin
+Architecture: all
+Depends: qt6-serialbus
+Description: Dummy transitional
+ Transitional dummy package.
+
 Package: libqt6serialbus6-dev
 Architecture: all
 Depends: qt6-serialbus-dev
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt6serialbus6-bin
+Package: qt6-serialbus-doc-dev
 Architecture: all
-Depends: qt6-serialbus
+Depends: qt6-serialbus-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-serialbus-doc-html
+Architecture: all
+Depends: qt6-serialbus-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-serialbus-examples
+Architecture: all
+Depends: qt6-serialbus-dev
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/not-installed b/debian/not-installed
index 09f2489..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +0,0 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialBus/6.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_serialbus_private.pri
diff --git a/debian/qt6-serialbus-doc.install b/debian/qt6-serialbus-doc.install
new file mode 100644
index 0000000..8536ff4
--- /dev/null
+++ b/debian/qt6-serialbus-doc.install
@@ -0,0 +1 @@
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 0d56bff..b7e471c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,29 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+# 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