Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits: d7b10b5f by Bas Couwenberg at 2019-09-30T16:48:29Z Bump Standards-Version to 4.4.1, no changes. - - - - - 635136af by Bas Couwenberg at 2019-10-09T05:27:26Z Add patch by Gudjon I. Gudjonsson to fix FTBFS with qscintilla 2.11.2. (closes: #942015) - - - - - 73096154 by Bas Couwenberg at 2019-10-09T07:51:16Z Update lintian overrides for file-references-package-build-path. - - - - - 9 changed files: - debian/changelog - debian/control - debian/libqgis-app3.4.12.lintian-overrides - debian/libqgis-core3.4.12.lintian-overrides → debian/libqgis-dev.lintian-overrides - + debian/patches/qscintilla-2.11.patch - debian/patches/series - + debian/python3-qgis-common.lintian-overrides - + debian/qgis-api-doc.lintian-overrides - debian/qgis-common.lintian-overrides Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +qgis (3.4.12+dfsg-2) UNRELEASED; urgency=medium + + * Bump Standards-Version to 4.4.1, no changes. + * Add patch by Gudjon I. Gudjonsson to fix FTBFS with qscintilla 2.11.2. + (closes: #942015) + * Update lintian overrides for file-references-package-build-path. + + -- Bas Couwenberg <[email protected]> Mon, 30 Sep 2019 18:48:13 +0200 + qgis (3.4.12+dfsg-1) unstable; urgency=medium * Update symbols for other architectures. ===================================== debian/control ===================================== @@ -84,7 +84,7 @@ Build-Depends: bison, pkg-kde-tools Build-Conflicts: libqgis-dev, qgis-dev -Standards-Version: 4.4.0 +Standards-Version: 4.4.1 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/libqgis-app3.4.12.lintian-overrides ===================================== @@ -1,6 +1,3 @@ -# Cannot easily be fixed -file-references-package-build-path * - # False positive, string not included in source spelling-error-in-binary * addres address ===================================== debian/libqgis-core3.4.12.lintian-overrides → debian/libqgis-dev.lintian-overrides ===================================== ===================================== debian/patches/qscintilla-2.11.patch ===================================== @@ -0,0 +1,15 @@ +Description: Fix FTBFS with qscintilla 2.11.2. +Author: Gudjon I. Gudjonsson <[email protected]> +Bug-Debian: https://bugs.debian.org/942015 + +--- a/src/core/qgsopenclutils.h ++++ b/src/core/qgsopenclutils.h +@@ -28,7 +28,7 @@ + #else + #define CL_USE_DEPRECATED_OPENCL_1_1_APIS + #define CL_HPP_TARGET_OPENCL_VERSION 220 +-#define CL_TARGET_OPENCL_VERSION 200 ++#define CL_TARGET_OPENCL_VERSION 220 + #endif + + #include <CL/cl2.hpp> ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ python-env.patch developersmap-use-debian-package.patch exclude-elvensword-resources.patch grass78.patch +qscintilla-2.11.patch ===================================== debian/python3-qgis-common.lintian-overrides ===================================== @@ -0,0 +1,3 @@ +# Cannot easily be fixed +file-references-package-build-path * + ===================================== debian/qgis-api-doc.lintian-overrides ===================================== @@ -0,0 +1,3 @@ +# Cannot easily be fixed +file-references-package-build-path * + ===================================== debian/qgis-common.lintian-overrides ===================================== @@ -1,2 +1,6 @@ package-contains-broken-symlink usr/share/qgis/doc/LICENSE ../../common-licenses/GPL-2 package-contains-broken-symlink usr/share/qgis/doc/leaflet ../../javascript/leaflet + +# Cannot easily be fixed +file-references-package-build-path * + View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/572f9e88c469040d27989f3e1952aa6603a6c3fa...73096154481cd58297fd2f887894a9ff3237349f -- View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/572f9e88c469040d27989f3e1952aa6603a6c3fa...73096154481cd58297fd2f887894a9ff3237349f 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
