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

[Carlos De Maine]

Git commit 9d3a24c86a5cce59185a96d6d07419d747f7077e by Carlos De Maine.
Committed on 24/10/2023 at 12:32.
Pushed by carlosdem into branch 'Neon/release'.

sync to debian

M  +28   -1    debian/control
A  +1    -0    debian/qt6-connectivity-doc.install
M  +18   -3    debian/rules

https://invent.kde.org/neon/qt6/qt6-connectivity/-/commit/9d3a24c86a5cce59185a96d6d07419d747f7077e

diff --git a/debian/control b/debian/control
index 79bb7cb..2556b0f 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,10 @@ Build-Depends: cmake,
                pkg-kde-tools,
                qt6-base-dev (>= 6.4.2+dfsg~),
                qt6-declarative-dev (>= 6.4.2+dfsg~)
-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-connectivity
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-connectivity.git
@@ -47,6 +50,18 @@ Description: Qt 6 Connectivity - development files
  This package contains the header development files used for building Qt 6
  applications using Qt 6 Connectivity libraries.
 
+Package: qt6-connectivity-doc
+Architecture: all
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-base-doc, qt6-connectivity-dev (= ${binary:Version}), ${misc:Depends}
+Description: Qt 6 Connectivity - 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 header documentation files used to help build Qt 6
+ applications using Qt 6 Connectivity libraries.
+
 Package: libqt6bluetooth6
 Architecture: all
 Depends: qt6-connectivity
@@ -64,3 +79,15 @@ Architecture: all
 Depends: qt6-connectivity
 Description: Dummy transitional
  Transitional dummy package.
+
+Package: qt6-connectivity-doc-html
+Architecture: all
+Depends: qt6-connectivity-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-connectivity-examples
+Architecture: all
+Depends: qt6-connectivity-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-connectivity-doc.install b/debian/qt6-connectivity-doc.install
new file mode 100644
index 0000000..8536ff4
--- /dev/null
+++ b/debian/qt6-connectivity-doc.install
@@ -0,0 +1 @@
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 62ab791..c61e880 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,12 @@
 
 include /usr/share/dpkg/architecture.mk
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+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
@@ -10,8 +15,18 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 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