Skip to content
Commits on Source (5)
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ fc7a292f
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 <sebastic@debian.org> Thu, 05 Jul 2018 07:02:47 +0200
qgis (2.18.21+dfsg-1) unstable; urgency=medium
* Update symbols for other architectures.
......
debian/control
View file @ fc7a292f
......@@ -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 0 → 100644
View file @ fc7a292f
Description: Fix build with SIP 4.19.11.
Author: Juergen E. Fischer <jef@norbit.de>
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
View file @ fc7a292f
......@@ -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 0 → 100644
View file @ fc7a292f
# Embedded API documentation
package-contains-documentation-outside-usr-share-doc usr/share/qgis/doc/api/*.html
debian/rules
View file @ fc7a292f
......@@ -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
......