[neon/qt/qbs/Neon/release] debian: Drop docs_install_path.diff, a different fix was applied upstream.

[Dmitry Shachnev]

Git commit a53ef2da9f7792a4595713c398d8d07e3821c4fe by Dmitry Shachnev.
Committed on 01/05/2022 at 18:51.
Pushed by jriddell into branch 'Neon/release'.

Drop docs_install_path.diff, a different fix was applied upstream.

Update install path for QCH docs.

M  +2    -0    debian/changelog
D  +0    -22   debian/patches/docs_install_path.diff
M  +0    -1    debian/patches/series
M  +1    -1    debian/qbs-doc.install

https://invent.kde.org/neon/qt/qbs/commit/a53ef2da9f7792a4595713c398d8d07e3821c4fe

diff --git a/debian/changelog b/debian/changelog
index d0def8b..150ba35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qbs (1.22.1-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop docs_install_path.diff, a different fix was applied upstream.
+    - Update install path for QCH docs.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 May 2022 21:11:11 +0300
 
diff --git a/debian/patches/docs_install_path.diff b/debian/patches/docs_install_path.diff
deleted file mode 100644
index 999220c..0000000
--- a/debian/patches/docs_install_path.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-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 8cd273e..e7f0684 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ 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/qbs-doc.install b/debian/qbs-doc.install
index 1e1b846..6496ea4 100644
--- a/debian/qbs-doc.install
+++ b/debian/qbs-doc.install
@@ -1 +1 @@
-usr/share/qt5/doc/qbs.qch
+usr/share/doc/qbs/qbs.qch