[neon/qt6/qt6-virtualkeyboard/Neon/release] debian: align to debian

[Carlos De Maine]

Git commit 76ba3c6db9a6fcf3f16c68be594bd8b2072275e6 by Carlos De Maine.
Committed on 22/10/2023 at 15:01.
Pushed by carlosdem into branch 'Neon/release'.

align to debian

M  +21   -1    debian/control
M  +27   -3    debian/rules

https://invent.kde.org/neon/qt6/qt6-virtualkeyboard/-/commit/76ba3c6db9a6fcf3f16c68be594bd8b2072275e6

diff --git a/debian/control b/debian/control
index afd2a58..7df11b2 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,9 @@ Build-Depends: cmake,
                qt6-svg-dev (>= 6.4.2~),
                xauth <!nocheck>,
                xvfb <!nocheck>
-Standards-Version: 4.6.1
+Build-Depends-Indep: qt6-base-dev (>= 6.4~) <!nodoc>,
+                     qt6-documentation-tools (>= 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-virtualkeyboard
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-virtualkeyboard.git
@@ -92,3 +94,21 @@ Architecture: all
 Depends: qt6-virtualkeyboard
 Description: Dummy transitional
  Transitional dummy package.
+
+Package: qt6-virtualkeyboard-doc
+Architecture: all
+Depends: qt6-virtualkeyboard-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-virtualkeyboard-doc-html
+Architecture: all
+Depends: qt6-virtualkeyboard-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-virtualkeyboard-examples
+Architecture: all
+Depends: qt6-virtualkeyboard-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/rules b/debian/rules
index 0d56bff..5267a95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,41 @@
 #!/usr/bin/make -f
-
 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
+
+# Hack around #1040496. While I do not think this is serious it is indeed
+# important and might be fixed in Qt >= 6.5
+PARALLEL_OPTION = $(filter parallel=%,$(DEB_BUILD_OPTIONS))
+ifneq (,$(PARALLEL_OPTION))
+	NUMJOBS = $(patsubst parallel=%,%,$(PARALLEL_OPTION))
+	ifeq ($(NUMJOBS), 1)
+		DEB_BUILD_OPTIONS := $(subst parallel=1,parallel=2,$(DEB_BUILD_OPTIONS))
+	endif
+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