* debian packaging update

* include qch download link on api index page
qgis · May 19, 2016 · 3ac9364 · 3ac9364
1 parent 6f07322
commit 3ac9364
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -5,6 +5,7 @@ qgis (2.15.0) UNRELEASED; urgency=medium
   * drop ubuntu utopic and vivid
   * refine GSL build dependency
   * limit python-future to stretch, sid, wily and xenial
+  * include qgis.qch in qgis-api-doc
 
   [ Matthias Kuhn ]
   * Add dependency to python-future

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -18,7 +18,7 @@ IF(TXT2TAGS_EXECUTABLE)
   ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES})
 ELSE(TXT2TAGS_EXECUTABLE)
   SET(QGIS_DOC_FILES
-    ${CMAKE_SOURCE_DIR}/INSTALL 
+    ${CMAKE_SOURCE_DIR}/INSTALL
   )
 ENDIF(TXT2TAGS_EXECUTABLE)
 
@@ -56,6 +56,9 @@ IF(WITH_APIDOC)
             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)
   ELSE(DOXYGEN_FOUND)
     MESSAGE(STATUS "QGIS api documentation not built - Doxygen not found")
   ENDIF(DOXYGEN_FOUND)

diff --git a/doc/index.dox b/doc/index.dox
@@ -20,7 +20,8 @@ users on our mailing lists and forums. Financial contributions are also
 welcome.
 
 You can also <a href="http://qgis.org/downloads/qgis-api-doc.zip">download</a>
-the the documentation for offline use.
+this documentation or a <a href="qgis.qch">Qt help file</a>
+for offline use.
 
 \section index_APIStability Earlier versions of the API