Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits: 08e4f3f9 by Bas Couwenberg at 2018-07-04T07:18:04+02:00 Add patch to support SIP 4.19.10+. - - - - - 7df03047 by Bas Couwenberg at 2018-07-05T07:02:46+02:00 Add upstream patch to support SIP 4.19.11. - - - - - c9bf21ab by Bas Couwenberg at 2018-07-05T09:32:27+02:00 Fix package-contains-documentation-outside-usr-share-doc lintian issues. - - - - - c235ba20 by Bas Couwenberg at 2018-07-05T09:37:13+02:00 Bump Standards-Version to 4.1.5, no changes. - - - - - fc7a292f by Bas Couwenberg at 2018-07-05T09:37:13+02:00 Set distribution to unstable. - - - - - 6 changed files: - debian/changelog - debian/control - + debian/patches/0001-fix-build-with-SIP-4.19.11-fixes-19332.patch - debian/patches/series - + debian/qgis-api-doc.lintian-overrides - debian/rules Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +qgis (2.18.21+dfsg-2) unstable; urgency=medium + + * Add upstream patch to support SIP 4.19.11. + * Fix package-contains-documentation-outside-usr-share-doc lintian issues. + * Bump Standards-Version to 4.1.5, no changes. + + -- Bas Couwenberg <[email protected]> Thu, 05 Jul 2018 07:02:47 +0200 + qgis (2.18.21+dfsg-1) unstable; urgency=medium * Update symbols for other architectures. ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -68,7 +68,7 @@ Build-Depends: bison, pkg-kde-tools Build-Conflicts: libqgis-dev, qgis-dev -Standards-Version: 4.1.4 +Standards-Version: 4.1.5 Vcs-Browser: https://salsa.debian.org/debian-gis-team/qgis Vcs-Git: https://salsa.debian.org/debian-gis-team/qgis.git Homepage: https://qgis.org/ ===================================== debian/patches/0001-fix-build-with-SIP-4.19.11-fixes-19332.patch ===================================== --- /dev/null +++ b/debian/patches/0001-fix-build-with-SIP-4.19.11-fixes-19332.patch @@ -0,0 +1,30 @@ +Description: Fix build with SIP 4.19.11. +Author: Juergen E. Fischer <[email protected]> +Origin: https://github.com/qgis/QGIS/commit/a0b6dc2d0dc1eda466ad9caae7e4fdb70b9892d8 +Bug: https://issues.qgis.org/issues/19332 + +--- a/cmake/FindSIP.py ++++ b/cmake/FindSIP.py +@@ -39,4 +39,8 @@ print("sip_version_str:%s" % sipcfg.sip_ + print("sip_bin:%s" % sipcfg.sip_bin) + print("default_sip_dir:%s" % sipcfg.default_sip_dir) + print("sip_inc_dir:%s" % sipcfg.sip_inc_dir) +-print("sip_mod_dir:%s" % sipcfg.sip_mod_dir) ++if hasattr(sipcfg, "sip_mod_dir"): ++ print("sip_mod_dir:%s" % sipcfg.sip_mod_dir) ++else: ++ # SIP 4.19.10+ has no sipcfg.sip_mod_dir ++ print("sip_mod_dir:%s" % sipcfg.sip_module_dir) +--- a/cmake/SIPMacros.cmake ++++ b/cmake/SIPMacros.cmake +@@ -96,6 +96,10 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MO + ADD_DEFINITIONS( /bigobj ) + ENDIF(MSVC) + ++ IF(NOT SIP_VERSION_NUM LESS 267018) ++ SET(_sip_x ${_sip_x} -n sip) ++ ENDIF(NOT SIP_VERSION_NUM LESS 267018) ++ + SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}) + SET(SUPPRESS_SIP_WARNINGS FALSE CACHE BOOL "Hide SIP warnings") + MARK_AS_ADVANCED(SUPPRESS_SIP_WARNINGS) ===================================== debian/patches/series ===================================== --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ exclude-elvensword-resources.patch occurred-typo.patch number-typo.patch columns-typo.patch +0001-fix-build-with-SIP-4.19.11-fixes-19332.patch ===================================== debian/qgis-api-doc.lintian-overrides ===================================== --- /dev/null +++ b/debian/qgis-api-doc.lintian-overrides @@ -0,0 +1,3 @@ +# Embedded API documentation +package-contains-documentation-outside-usr-share-doc usr/share/qgis/doc/api/*.html + ===================================== debian/rules ===================================== --- a/debian/rules +++ b/debian/rules @@ -263,6 +263,13 @@ install-arch-stamp: $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/LICENSE $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/MetaSearch/LICENSE.txt + # remove documentation outside usr/share/doc + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/README + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/TODO + + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/README-qgis.txt + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/README.txt + # Man pages are installed by dh_installman $(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1 $(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1 View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/335414d50c5fe3c51699f3f0bff555d003128c92...fc7a292f54f62dc1d8d29331a6a6d3e84ac510bf -- View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/335414d50c5fe3c51699f3f0bff555d003128c92...fc7a292f54f62dc1d8d29331a6a6d3e84ac510bf You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
