[neon/qt/qbs/Neon/release] debian: Add a patch to fix documentation install with CMake.

[Dmitry Shachnev]

Git commit 28ef2c1e0abdfdd37c89226c8831f2e6fe88abf9 by Dmitry Shachnev.
Committed on 02/04/2022 at 17:28.
Pushed by jriddell into branch 'Neon/release'.

Add a patch to fix documentation install with CMake.

M  +1    -0    debian/changelog
A  +22   -0    debian/patches/docs_install_path.diff
M  +1    -0    debian/patches/series
M  +0    -2    debian/rules

https://invent.kde.org/neon/qt/qbs/commit/28ef2c1e0abdfdd37c89226c8831f2e6fe88abf9

diff --git a/debian/changelog b/debian/changelog
index 6629d9c..1b1b31f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ qbs (1.22.0-1) UNRELEASED; urgency=medium
   * Update symbols files from the current build logs.
   * Update debian/copyright.
   * Remove patches that are not relevant since switch to CMake.
+  * Add a patch to fix documentation install with CMake.
 
  -- Marius Gripsgard <marius at ubports.com>  Tue, 28 Dec 2021 17:30:52 +0100
 
diff --git a/debian/patches/docs_install_path.diff b/debian/patches/docs_install_path.diff
new file mode 100644
index 0000000..999220c
--- /dev/null
+++ b/debian/patches/docs_install_path.diff
@@ -0,0 +1,22 @@
+Description: fix install of QCH and HTML documentation
+ - qbs.qch should go to QT_INSTALL_DOCS, not to QBS_DOC_INSTALL_DIR
+   (which ends with /html by default).
+ - HTML documentation was not installed at all.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: https://codereview.qt-project.org/c/qbs/qbs/+/404053
+Last-Update: 2022-04-02
+
+--- a/cmake/QbsDocumentation.cmake
++++ b/cmake/QbsDocumentation.cmake
+@@ -227,8 +227,10 @@ function(_qbs_setup_qhelpgenerator_targe
+     add_custom_target("${_qch_target}" DEPENDS "${_qch_artifact}")
+     add_dependencies(qbs_qch_docs "${_qch_target}")
+ 
+-    install(FILES "${_qch_outputdir}/${_target}.qch" DESTINATION "${_arg_INSTALL_DIR}"
++    install(FILES "${_qch_outputdir}/${_target}.qch" DESTINATION "${QT_INSTALL_DOCS}"
+         COMPONENT qbs_qch_docs)
++    install(DIRECTORY "${_qch_outputdir}/html/" DESTINATION "${_arg_INSTALL_DIR}"
++        COMPONENT qbs_html_docs)
+ endfunction()
+ 
+ # Helper functions:
diff --git a/debian/patches/series b/debian/patches/series
index e7f0684..8cd273e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
 disable_bad_assembly.diff
 doc_Install_man_pages_with_cmake.diff
+docs_install_path.diff
diff --git a/debian/rules b/debian/rules
index 95d8873..5c72feb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,4 @@ override_dh_install:
 	rm -fv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libqbscore.so.1
 	rm -fv debian/tmp/usr/libexec/qbs/dmgbuild
 	rm -rfv debian/tmp/usr/share/qbs/python
-	mkdir -p debian/tmp/usr/share/qt5/doc
-	cp $(BUILDPATH)/doc/qbs.qch debian/tmp/usr/share/qt5/doc/qbs.qch
 	dh_install