[qgis] 01/03: Fix qgis.qch install in arch-indep target.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository qgis.

commit 160209b01be86590df7dd08ce36a86764cf948e5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Feb 26 08:09:38 2018 +0100

    Fix qgis.qch install in arch-indep target.
---
 debian/changelog                     |  6 ++++++
 debian/patches/disable-doxygen.patch | 16 ++++++++++++----
 debian/rules                         |  3 +++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1fdc2a..c8084b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.18.17+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Fix qgis.qch install in arch-indep target.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 26 Feb 2018 08:08:31 +0100
+
 qgis (2.18.17+dfsg-1~exp1) experimental; urgency=medium
 
   [ Jürgen E. Fischer ]
diff --git a/debian/patches/disable-doxygen.patch b/debian/patches/disable-doxygen.patch
index 4bde58b..c31e2b1 100644
--- a/debian/patches/disable-doxygen.patch
+++ b/debian/patches/disable-doxygen.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/doc/CMakeLists.txt
 +++ b/doc/CMakeLists.txt
-@@ -53,12 +53,12 @@ IF(WITH_APIDOC)
+@@ -53,16 +53,16 @@ IF(WITH_APIDOC)
      ENDIF(QT_TAG_FILE)
  
      CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
@@ -14,12 +14,20 @@ Forwarded: not-needed
 -            DEPENDS qgis_core qgis_gui qgis_analysis version
 -            COMMENT "Generating API documentation" VERBATIM)
 -    INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/api/html/ DESTINATION ${QGIS_DATA_DIR}/doc/api)
+-    INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/doc/api)
+-    IF(GENERATE_QHP)
+-      INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/api/qch/qgis.qch DESTINATION ${QGIS_DATA_DIR}/doc/api)
+-    ENDIF(GENERATE_QHP)
 +    #ADD_CUSTOM_TARGET(apidoc ALL
 +    #        COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
 +    #        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 +    #        DEPENDS qgis_core qgis_gui qgis_analysis version
 +    #        COMMENT "Generating API documentation" VERBATIM)
 +    #INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/api/html/ DESTINATION ${QGIS_DATA_DIR}/doc/api)
-     INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/doc/api)
-     IF(GENERATE_QHP)
-       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/api/qch/qgis.qch DESTINATION ${QGIS_DATA_DIR}/doc/api)
++    #INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/doc/api)
++    #IF(GENERATE_QHP)
++    #  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/api/qch/qgis.qch DESTINATION ${QGIS_DATA_DIR}/doc/api)
++    #ENDIF(GENERATE_QHP)
+   ELSE(DOXYGEN_FOUND)
+     MESSAGE(STATUS "QGIS api documentation not built - Doxygen not found")
+   ENDIF(DOXYGEN_FOUND)
diff --git a/debian/rules b/debian/rules
index ef77368..d44546a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -336,6 +336,9 @@ override_dh_auto_install-indep: install-arch-stamp
 	install -o root -g root -m 755 -d $(CURDIR)/debian/tmp/usr/share/qgis/doc
 	mv -v $(QGIS_BUILDDIR)/doc/api/html $(CURDIR)/debian/tmp/usr/share/qgis/doc/api
 
+	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon-60x60.png $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/
+	install -o root -g root -m 644 $(QGIS_BUILDDIR)/doc/api/qch/qgis.qch $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/
+
 override_dh_install:
 	dh_install --autodest --list-missing
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git