[neon/qt6/qt6-doc/Neon/release] debian: Revert " Revert "bring qt6-doc back""

[Jonathan Esk-Riddell]

Git commit 1d285ccb08394c96ef4f2411fc8d5e6467eefef0 by Jonathan Esk-Riddell.
Committed on 24/10/2023 at 12:04.
Pushed by jriddell into branch 'Neon/release'.

Revert " Revert "bring qt6-doc back""

This reverts commit e89af94684fba7f9659768ea5562c2f62377fafa.

M  +95   -6    debian/control
A  +0    -0    debian/qt6-doc.install
M  +21   -0    debian/rules

https://invent.kde.org/neon/qt6/qt6-doc/-/commit/1d285ccb08394c96ef4f2411fc8d5e6467eefef0

diff --git a/debian/control b/debian/control
index 6d4acbd..932d981 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,34 @@ Build-Depends: cmake,
                pkg-config,
                qt6-base-dev (>= 6.2.2+dfsg~),
                qt6-declarative-dev (>= 6.2.2+dfsg~)
-Standards-Version: 4.6.0
+Build-Depends-Indep: qt6-3d-doc-html,
+                     qt6-5compat-doc-html,
+                     qt6-base-doc-html,
+                     qt6-charts-doc-html,
+                     qt6-connectivity-doc-html,
+                     qt6-datavis3d-doc-html,
+                     qt6-declarative-doc-html,
+                     qt6-httpserver-doc-html,
+                     qt6-imageformats-doc-html,
+                     qt6-multimedia-doc-html,
+                     qt6-networkauth-doc-html,
+                     qt6-positioning-doc-html,
+                     qt6-quick3d-doc-html,
+                     qt6-remoteobjects-doc-html,
+                     qt6-scxml-doc-html,
+                     qt6-sensors-doc-html,
+                     qt6-serialbus-doc-html,
+                     qt6-serialport-doc-html,
+                     qt6-shadertools-doc-html,
+                     qt6-speech-doc-html,
+                     qt6-svg-doc-html,
+                     qt6-tools-doc-html,
+                     qt6-virtualkeyboard-doc-html,
+                     qt6-wayland-doc-html,
+                     qt6-webchannel-doc-html,
+                     qt6-websockets-doc-html,
+                     qt6-webview-doc-html,
+Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-doc
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-doc.git
@@ -22,12 +49,74 @@ Rules-Requires-Root: no
 
 Package: qt6-doc
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: qt6-3d-doc,
+         qt6-5compat-doc,
+         qt6-base-doc,
+         qt6-charts-doc,
+         qt6-connectivity-doc,
+         qt6-datavis3d-doc,
+         qt6-declarative-doc,
+         qt6-httpserver-doc,
+         qt6-imageformats-doc,
+         qt6-multimedia-doc,
+         qt6-networkauth-doc,
+         qt6-positioning-doc,
+         qt6-quick3d-doc,
+         qt6-remoteobjects-doc,
+         qt6-scxml-doc,
+         qt6-sensors-doc,
+         qt6-serialbus-doc,
+         qt6-serialport-doc,
+         qt6-shadertools-doc,
+         qt6-speech-doc,
+         qt6-svg-doc,
+         qt6-tools-doc,
+         qt6-virtualkeyboard-doc,
+         qt6-wayland-doc,
+         qt6-webchannel-doc,
+         qt6-websockets-doc,
+         qt6-webview-doc,
+         ${misc:Depends},
+         shlibs:Depends,
+Recommends: assistant-qt6,
+Suggests: qt6-base-dev,
+Description: Qt 6 documentation in Qt's help format
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ Qt Documentation contains the offline documentation for Qt 6.
+ This package contains the complete Qt 6 API documentation (Qt's help format).
+ .
+ The documentation is provided in the Qt's help format and manpage format;
+ the Qt's help format version can be viewed in conjunction with the Qt Assistant
+ found in the assistant-qt6 package.
 
 Package: qt6-doc-dev
 Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
+Description: Qt 6 documentation in Qt's help format
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ Qt Documentation contains the offline documentation for Qt 6.
+ This package contains the complete Qt 6 API documentation (Qt's help format).
+ .
+ The documentation is provided in the Qt's help format and manpage format;
+ the Qt's help format version can be viewed in conjunction with the Qt Assistant
+ found in the assistant-qt6 package.
+
+Package: qt6-doc-html
+Architecture: all
+Depends: qt6-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-demos
+Architecture: all
+Depends: qt6-doc
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-doc.install b/debian/qt6-doc.install
new file mode 100644
index 0000000..e69de29
diff --git a/debian/rules b/debian/rules
index 9849451..9bdbaac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,25 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
+
+# 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 $@ --buildsystem=cmake+ninja
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+                --log-level=STATUS \
+                -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' {} \;