Bas Couwenberg pushed to branch experimental at Debian GIS Project / qgis
Commits: 160209b0 by Bas Couwenberg at 2018-02-26T08:09:38+01:00 Fix qgis.qch install in arch-indep target. - - - - - 9ce12b83 by Bas Couwenberg at 2018-02-26T09:14:13+01:00 Include libarcgis*provider.so in qgis-providers. - - - - - 71c41e75 by Bas Couwenberg at 2018-02-26T09:25:15+01:00 Set distribution to experimental. - - - - - 4 changed files: - debian/changelog - debian/patches/disable-doxygen.patch - debian/qgis-providers.install - debian/rules Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +qgis (2.18.17+dfsg-1~exp2) experimental; urgency=medium + + * Fix qgis.qch install in arch-indep target. + * Include libarcgis*provider.so in qgis-providers. + + -- Bas Couwenberg <sebas...@debian.org> Mon, 26 Feb 2018 09:24:53 +0100 + qgis (2.18.17+dfsg-1~exp1) experimental; urgency=medium [ Jürgen E. Fischer ] ===================================== debian/patches/disable-doxygen.patch ===================================== --- 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) ===================================== debian/qgis-providers.install ===================================== --- a/debian/qgis-providers.install +++ b/debian/qgis-providers.install @@ -1,4 +1,6 @@ usr/lib/qgis/crssync +usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so +usr/lib/qgis/plugins/libarcgismapserverprovider.so usr/lib/qgis/plugins/libbasicauthmethod.so usr/lib/qgis/plugins/libdb2provider.so usr/lib/qgis/plugins/libdelimitedtextprovider.so ===================================== debian/rules ===================================== --- 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 View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/102d7741de6af0b2a96bda49729fa97c6c203ff0...71c41e759da482e7558c4a2190cc90954a734075 --- View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/102d7741de6af0b2a96bda49729fa97c6c203ff0...71c41e759da482e7558c4a2190cc90954a734075 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel