[qgis] 02/07: Merge tag 'upstream/2.18.18+dfsg'
Bas Couwenberg
sebastic at debian.org
Fri Mar 23 16:05:26 UTC 2018
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit 3550d390d6d0312c351e20b7c68d0014bb324f87
Merge: 069b646 a84738f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Mar 23 14:22:57 2018 +0100
Merge tag 'upstream/2.18.18+dfsg'
Upstream version 2.18.18+dfsg
CMakeLists.txt | 2 +-
ChangeLog | 127 +
debian/changelog | 6 +
debian/rules | 14 +-
doc/TRANSLATORS | 4 +-
i18n/qgis_it.ts | 12452 +++++++++++--------
i18n/qgis_pl.ts | 352 +-
python/plugins/processing/algs/r/RAlgorithm.py | 9 +-
python/plugins/processing/gui/Postprocessing.py | 10 +
.../plugins/processing/script/ScriptAlgorithm.py | 7 +-
src/providers/wfs/qgswfsprovider.cpp | 7 +
src/providers/wms/CMakeLists.txt | 2 +
src/server/qgsowsserver.cpp | 8 +-
src/server/qgsserverprojectparser.cpp | 41 +
src/server/qgsserverprojectparser.h | 3 +
src/server/qgswfsprojectparser.cpp | 2 +-
src/server/qgswfsserver.cpp | 114 +-
src/server/qgswfsserver.h | 13 +-
src/server/qgswmsprojectparser.cpp | 2 +-
src/server/qgswmsserver.cpp | 10 +
tests/src/python/test_qgsserver.py | 4 +-
tests/src/python/test_qgsserver_accesscontrol.py | 4 +-
.../WMS_GetMap_Selection/WMS_GetMap_Selection.png | Bin 53116 -> 51025 bytes
23 files changed, 7432 insertions(+), 5761 deletions(-)
diff --cc debian/changelog
index cf2df6d,09c3b50..96b1bce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,720 -1,160 +1,726 @@@
+ qgis (2.18.18) UNRELEASED; urgency=medium
+
+ * Release of 2.18.18
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 23 Mar 2018 13:00:13 +0100
+
-qgis (2.18.17) unstable; urgency=medium
+qgis (2.18.17+dfsg-1) unstable; urgency=medium
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 27 Feb 2018 07:48:19 +0100
+
+qgis (2.18.17+dfsg-1~exp3) experimental; urgency=medium
+
+ * Add patch to add dependency on qgis_gui target to fix parallel build.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 26 Feb 2018 19:06:48 +0100
+
+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 <sebastic at debian.org> Mon, 26 Feb 2018 09:24:53 +0100
+
+qgis (2.18.17+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
* Release of 2.18.17
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 23 Mar 2018 13:00:13 +0100
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Drop patches applied upstream. Refresh remaining patches.
+ * Add Breaks/Replaces for files moved from qgis to qgis-common.
+ * Update copyright file, changes:
+ - Update copyright years for copyright holders
+ - Add new copyright holders
+ - Add license & copyright for future
+ - Add license & copyright for libdrxfw
+ * Restore rules to disable QtWebKit.
+ * Don't install libarcgi*provides.so, not built.
+ * Add libqjson-dev to build dependencies.
+ * Add lintian overrides for spelling-error-in-binary false positives.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 23 Feb 2018 18:12:42 +0100
+
+qgis (2.14.22+dfsg-3) UNRELEASED; urgency=medium
+
+ * Don't use libjs-jquery for Doxygen docs.
+ * Fix deprecated source override location.
+ * Update watch file for 2.18.x LTR releases.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 03 Feb 2018 11:27:27 +0100
+
+qgis (2.14.22+dfsg-2) unstable; urgency=medium
+
+ * Update packaging for GRASS 7.4.0.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 26 Jan 2018 11:44:46 +0100
+
+qgis (2.14.22+dfsg-1) unstable; urgency=medium
+
+ * Update copyright-format URL to use HTTPS.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 23 Jan 2018 18:15:36 +0100
+
+qgis (2.14.22+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.22
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update version specific symbols.
-qgis (2.18.16) unstable; urgency=medium
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 20 Jan 2018 09:01:38 +0100
- * Release of 2.18.16
+qgis (2.14.21+dfsg-3) unstable; urgency=medium
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 23 Feb 2018 13:02:21 +0100
+ * Replace libqca2-plugin-ossl transitional package with libqca2-plugins.
+ (closes: #886681)
+ * Update symbols for other architectures.
-qgis (2.18.15) unstable; urgency=medium
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 09 Jan 2018 07:26:27 +0100
- * Release of 2.18.15
+qgis (2.14.21+dfsg-2) unstable; urgency=medium
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 19 Jan 2018 14:13:44 +0100
+ * Update build dependency for libqscintilla2-dev.
+ (closes: #886194)
+ * Update symbols for other architectures.
+ * Bump Standards-Version to 4.1.3, no changes.
-qgis (2.18.14) unstable; urgency=medium
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 03 Jan 2018 08:20:24 +0100
- * Release of 2.18.14
+qgis (2.14.21+dfsg-1) unstable; urgency=medium
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 08 Dec 2017 14:00:24 +0100
+ * Update symbols for amd64 & other architectures.
+ * Move from experimental to unstable.
-qgis (2.18.13) unstable; urgency=medium
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 10 Dec 2017 14:25:15 +0100
- * Release of 2.18.13
+qgis (2.14.21+dfsg-1~exp1) experimental; urgency=medium
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 27 Oct 2017 14:00:21 +0200
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.21
-qgis (2.18.12) unstable; urgency=medium
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Partially revert GRASS 7.4 changes to build with GRASS 7.2.
+ * Strip trailing whitespace from control file.
+ * Disable use of QtWebKit.
+ (closes: #882663)
+ * Don't install PyQt4 files, no longer built.
+ * Disable Breaks/Replaces on python-qt4,
+ python-qgis no longer includes PyQt4 files.
+ * Drop obsolete dbg package.
+ * Bump Standards-Version to 4.1.2, no changes.
+ * Add lintian override for
+ dependency-on-python-version-marked-for-end-of-life.
- * Release of 2.18.12
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 08 Dec 2017 22:49:37 +0100
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 15 Sep 2017 15:08:52 +0200
+qgis (2.14.20+dfsg-2~exp2) experimental; urgency=medium
-qgis (2.18.11) unstable; urgency=medium
+ * Fix GRASS ABI dependency to include 'grass'.
- * Release of 2.18.11
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 17 Nov 2017 18:02:31 +0100
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 18 Aug 2017 14:31:22 +0200
+qgis (2.14.20+dfsg-2~exp1) experimental; urgency=medium
-qgis (2.18.10) unstable; urgency=medium
+ * Override dh_gencontrol to set GRASS ABI dependency with substvars.
+ * Strip trailing whitespace from changelog.
+ * Update packing for GRASS 7.4.
- * Release of 2.18.10
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 17 Nov 2017 12:35:39 +0100
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 21 Jul 2017 14:00:06 +0200
+qgis (2.14.20+dfsg-1) unstable; urgency=medium
-qgis (2.18.9) unstable; urgency=medium
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
- * Release of 2.18.9
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 30 Oct 2017 19:25:05 +0100
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 23 Jun 2017 14:00:07 +0200
+qgis (2.14.20+dfsg-1~exp1) experimental; urgency=medium
-qgis (2.18.8) unstable; urgency=medium
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.20
- * Release of 2.18.8
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Drop unused override for python-foo-but-no-python3-foo.
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 26 May 2017 14:00:05 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 28 Oct 2017 10:05:54 +0200
-qgis (2.18.7) unstable; urgency=medium
+qgis (2.14.19+dfsg-2) UNRELEASED; urgency=medium
- * Release of 2.18.7
+ * Add virtual GRASS ABI package to qgis-plugin-grass dependencies.
+ * Bump Standards-Version to 4.1.1, no changes.
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 19 May 2017 14:00:07 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 27 Sep 2017 19:51:54 +0200
-qgis (2.18.6) unstable; urgency=medium
+qgis (2.14.19+dfsg-1) unstable; urgency=medium
- * Release of 2.18.6
+ * Update symbols for other architectures.
+ * Drop unused lintian override for spelling-error-in-binary.
+ * Add lintian override for python-foo-but-no-python3-foo.
+ * Move libqgis-server to libs section.
+ * Change priority for qgis-dbg from extra to optional.
+ * Bump Standards-Version to 4.1.0, changes: priority.
+ * Move from experimental to unstable.
+ (closes: #876320)
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 21 Apr 2017 14:35:39 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 21 Sep 2017 07:55:48 +0200
-qgis (2.18.5) unstable; urgency=medium
+qgis (2.14.19+dfsg-1~exp1) experimental; urgency=medium
- * Release of 2.18.5
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.19
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 07 Apr 2017 14:12:04 +0200
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Drop remove-sip-workaround.patch, applied upstream.
+ * Remove mimelnk files for KDE3.
+ (closes: #875520)
+ * Update symbols for amd64.
-qgis (2.18.4) unstable; urgency=medium
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 15 Sep 2017 23:07:28 +0200
- * Release of 2.18.4
+qgis (2.14.18+dfsg-1) unstable; urgency=medium
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 24 Mar 2017 13:21:57 +0100
+ * Add patch by Dmitry Shachnev to fix FTBFS with SIP 4.19.3.
+ (closes: #872640)
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
-qgis (2.18.3) unstable; urgency=medium
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 22 Aug 2017 18:31:18 +0200
- * Release of 2.18.3
+qgis (2.14.18+dfsg-1~exp1) experimental; urgency=medium
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 24 Feb 2017 13:00:06 +0100
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.18
-qgis (2.18.2) unstable; urgency=medium
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update symbols for amd64.
- * Release of 2.18.2
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 18 Aug 2017 20:00:55 +0200
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 13 Jan 2017 13:00:04 +0100
+qgis (2.14.17+dfsg-1) unstable; urgency=medium
-qgis (2.18.1) unstable; urgency=medium
+ * Update symbols for other architectures.
+ * Fix malformed lintian overrides.
+ * Move from experimental to unstable.
- * Release of 2.18.1
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Jul 2017 09:02:37 +0200
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 16 Dec 2016 13:00:13 +0100
+qgis (2.14.17+dfsg-1~exp1) experimental; urgency=medium
-qgis (2.18.0) unstable; urgency=medium
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.17
- * Release of 2.18.0
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Add xvfb to qgis-server Suggests.
+ * Update symbols for amd64.
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 25 Nov 2016 14:13:12 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 21 Jul 2017 20:22:30 +0200
-qgis (2.17.0) unstable; urgency=medium
+qgis (2.14.16+dfsg-2) UNRELEASED; urgency=medium
- * New development version 2.17 after branch of 2.16
- * drop support for debian wheezy and ubuntu wily
- * add python-requests dependency for metasearch plugin
- * lintian fixes
- * add version constraint to libqgis-customwidgets dependency.
+ * Update gbp.conf to use --no-rollback for gbp import-orig.
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 21 Oct 2016 14:14:02 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 21 Jul 2017 20:03:09 +0200
-qgis (2.16.0) unstable; urgency=medium
+qgis (2.14.16+dfsg-1) unstable; urgency=medium
- * Release of 2.16.0
+ * Drop libopenscenegraph-dev build dependency, pulled in via libosgearth-dev.
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 08 Jul 2016 14:12:35 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 13 Jul 2017 07:56:17 +0200
-qgis (2.15.0) unstable; urgency=medium
+qgis (2.14.16+dfsg-1~exp1) experimental; urgency=medium
[ Jürgen E. Fischer ]
- * New development version 2.15 after branch of 2.14
- * 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
- * include arcgis rest provider
- * add python-future as dependency for python-qgis
+ * Release of 2.14.16
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Disable openscenegraph & osgearth build dependencies,
+ osgEarth 2.8 is not supported (yet) by the globe plugin.
+ * Add license & copyright for qtwebkit.py.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 23 Jun 2017 14:41:25 +0200
+
+qgis (2.14.15+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Bump Standards-Version to 4.0.0, no changes.
+ * Add autopkgtest to test installability.
+ * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
+ * Add lintian override for spelling-error-in-binary false positive.
+ * Use "-noawait" variant for qgis-crssync trigger.
+ * Move from experimental to unstable.
- [ Matthias Kuhn ]
- * Add dependency to python-future
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 18 Jun 2017 20:31:54 +0200
+
+qgis (2.14.15+dfsg-1~exp2) experimental; urgency=medium
+
+ * Add Breaks/Replaces to python-qgis-common for qgis_customwidgets.py move.
+ (closes: #864695)
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 13 Jun 2017 08:11:49 +0200
+
+qgis (2.14.15+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.15
[ Bas Couwenberg ]
- * Fix removal of obsolete diversions for bother the grass plugin & provider.
+ * New upstream release.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 26 May 2017 19:57:14 +0200
+
+qgis (2.14.14+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.14
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Refresh patches.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 22 Apr 2017 12:50:02 +0200
+
+qgis (2.14.13+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.13
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update copyright years for Victor Olaya.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 24 Mar 2017 17:22:03 +0100
+
+qgis (2.14.12+dfsg-1~exp2) experimental; urgency=medium
+
+ * Add patch to fix GRASS 7.2 support in processing.
+ (closes: #858251)
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 21 Mar 2017 12:07:19 +0100
+
+qgis (2.14.12+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.12
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Add Jorge Gustavo Rocha to copyright holders.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 24 Feb 2017 15:21:57 +0100
+
+qgis (2.14.11+dfsg-2) unstable; urgency=medium
+
+ * Add Breaks/Replaces on python-qt4 for QtWebKit.
+ (closes: #855048)
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 13 Feb 2017 18:43:07 +0100
+
+qgis (2.14.11+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 14 Jan 2017 09:39:46 +0100
+
+qgis (2.14.11+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.11
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Refresh patches.
+ * Update symbols for amd64.
+ * Add ${python:Depends} to python-qgis-common dependencies.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 13 Jan 2017 14:19:43 +0100
+
+qgis (2.14.10+dfsg-2) unstable; urgency=medium
+
+ * Bump minimum GRASS version to 7.2.0.
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 28 Dec 2016 20:01:31 +0100
+
+qgis (2.14.10+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 18 Dec 2016 14:54:37 +0100
+
+qgis (2.14.10+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.10
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 16 Dec 2016 15:01:27 +0100
+
+qgis (2.14.9+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 29 Nov 2016 07:15:41 +0100
+
+qgis (2.14.9+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.9
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update symbols for other architectures.
+ * Run doxygen in a subshell.
+ * Update copyright years for Alessandro Pasotti.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 25 Nov 2016 15:37:03 +0100
+
+qgis (2.14.8+dfsg-2~exp1) experimental; urgency=medium
+
+ * Update symbols for other architectures.
+ * Update dependencies & paths for GRASS 7.2.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Oct 2016 16:49:30 +0200
+
+qgis (2.14.8+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 26 Oct 2016 21:42:11 +0200
+
+qgis (2.14.8+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.8
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update copyright file, changes:
+ - Update copyright years for Marco Bernasocchi
+ - Add Andrea Aime to copyright holders
+ * Refresh patches.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 21 Oct 2016 20:18:11 +0200
+
+qgis (2.14.7+dfsg-2) unstable; urgency=medium
+
+ * Move icons to subdirectory.
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 29 Sep 2016 14:52:59 +0200
+
+qgis (2.14.7+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 28 Sep 2016 08:10:58 +0200
+
+qgis (2.14.7+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.7
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update copyright file, changes:
+ - Add license & copyright for QtWebKit files.
+ * Install PyQt4 files in python-qgis package.
+ * Re-enable QtWebKit support using embedded copy.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 25 Sep 2016 09:34:21 +0200
+
+qgis (2.14.6+dfsg-4) unstable; urgency=medium
+
+ * Add patch to fix 'columns' typo.
+ * Remove obsolete diversions in qgis.preinst again, but don't rename.
+ (closes: #836993)
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 18 Sep 2016 01:01:47 +0200
+
+qgis (2.14.6+dfsg-3) unstable; urgency=medium
+
+ * Remove obsolete diversions in postinst & prerm.
+ (closes: #836993)
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 11 Sep 2016 13:04:21 +0200
+
+qgis (2.14.6+dfsg-2) unstable; urgency=medium
+
+ * Move obsolete diversion removal from preinst to postinst.
+ (closes: #836993)
+ * Update symbols for armel & mipsel.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 07 Sep 2016 23:40:28 +0200
+
+qgis (2.14.6+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 03 Sep 2016 12:41:30 +0200
+
+qgis (2.14.6+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.6
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 26 Aug 2016 15:22:28 +0200
+
+qgis (2.14.5+dfsg-2) unstable; urgency=medium
+
+ * Add version constraint to libqgis-customwidgets dependency.
+ * Update symbols for other architectures.
+ * Drop libgsl0-dev alternative dependency.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 18 Aug 2016 13:28:43 +0200
+
+qgis (2.14.5+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 03 Aug 2016 11:16:53 +0200
+
+qgis (2.14.5+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.5
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 29 Jul 2016 15:53:16 +0200
+
+qgis (2.14.4+dfsg-2) UNRELEASED; urgency=medium
+
+ * Update install files to match paths for GRASS 6 & 7.
+ * Update symbols for sparc64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 24 Jul 2016 19:17:15 +0200
+
+qgis (2.14.4+dfsg-1) unstable; urgency=medium
+
+ [ Bas Couwenberg ]
+ * Fix installation path of scalable icons.
+ (closes: #830638)
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ [ Jürgen E. Fischer ]
+ * Drop usr/share/icons/scalable from qgis.install.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 13 Jul 2016 11:39:28 +0200
+
+qgis (2.14.4+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.4
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Disable globe plugin, doesn't support osgEarth 2.7 properly.
+ * Update copyright file, changes:
+ - Update copyright years for Sandro Santilli & The QGIS Project
+ - Add Even Rouault to copyright holders
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 08 Jul 2016 16:39:08 +0200
+
+qgis (2.14.3+dfsg-3) UNRELEASED; urgency=medium
+
+ * Update symbols for hppa & ppc64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 24 May 2016 00:16:17 +0200
+
+qgis (2.14.3+dfsg-2) unstable; urgency=medium
+
+ * Disable QtWebKit support, will be removed from Qt4.
+ (closes: #784514)
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 22 May 2016 18:31:53 +0200
+
+qgis (2.14.3+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for arm64 mips mipsel powerpc ppc64el s390x.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 22 May 2016 11:37:24 +0200
+
+qgis (2.14.3+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.3
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Add patch to add support for GNU/Hurd to GRASS plugin qtermwidget.
+ * Update copyright years for Sandro Mani in copyright file.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 20 May 2016 16:31:03 +0200
+
+qgis (2.14.2+dfsg-2) unstable; urgency=medium
+
+ * Add patch to add support for kFreeBSD to GRASS plugin.
+ (closes: #824079)
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 13 May 2016 09:33:14 +0200
+
+qgis (2.14.2+dfsg-1) unstable; urgency=medium
+
+ * Disable check for new version of QGIS at startup.
+ To re-enable the version check, edit /etc/defaults/qgis
+ and remove --noversioncheck from QGIS_OPTS.
+ (closes: #823283)
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 11 May 2016 18:54:05 +0200
+
+qgis (2.14.2+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.2
+ (closes: #822477)
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Bump Standards-Version to 3.9.8, no changes.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 29 Apr 2016 21:07:07 +0200
+
+qgis (2.14.1+dfsg-2) unstable; urgency=medium
+
+ * Add python-shapely to python-qgis-common dependencies.
+ (closes: #820281)
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 07 Apr 2016 07:10:22 +0200
+
+qgis (2.14.1+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 28 Mar 2016 11:30:58 +0200
+
+qgis (2.14.1+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.1
+
+ [ Bas Couwenberg ]
+ * Update copyright file, changes:
+ - Add license & copyright for qwtpolar-1.1.1
+ - Group CMake files by Simon Edwards
+ * Re-enable QwtPolar, qwtpolar-1.1 supports Qwt > 6.0.
+ * Enable all hardening buildflags.
+ * Drop globe-adapt-to-osgearth-2.7.patch, included upstream.
+ Refresh remaining patches.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 25 Mar 2016 16:41:46 +0100
+
+qgis (2.14.0+dfsg0-3) unstable; urgency=medium
+
+ * Recreate symbols files, old ones failed to patch.
+ * Fix build with `dpkg-buildpackage -A`. Various files in architecture
+ independent packages are built in the -arch target.
+ (closes: #817811)
+ * Update various URLs to use HTTPS.
+ * Drop unused lintian override for binaries-have-file-conflict.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 10 Mar 2016 20:52:00 +0100
+
+qgis (2.14.0+dfsg0-2) unstable; urgency=medium
+
+ * Restore use of pkgkde_symbolshelper by dh.
+ * Add patch for osgEarth 2.7 support, re-enable globe plugin.
+ * Fix removal of obsolete diversions for both the grass plugin & provider.
(closes: #817176)
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 08 Jul 2016 14:11:47 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 09 Mar 2016 19:11:51 +0100
-qgis (2.14.0) unstable; urgency=medium
+qgis (2.14.0+dfsg0-1) unstable; urgency=medium
- * Release of 2.14.0
+ * Disable globe plugin, fails to build with osgEarth 2.7.
+ * Add Breaks/Replaces to qgis for binaries moved from grass provider.
+ * Add patch to fix 'number' typo.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 08 Mar 2016 07:12:13 +0100
+
+qgis (2.14.0+dfsg0-1~exp1) experimental; urgency=medium
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 26 Feb 2016 13:23:49 +0100
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.0
-qgis (2.13.0) unstable; urgency=medium
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Bump Standards-Version to 3.9.7, no changes.
+ * Merge upstream packaging changes, re-enable grass plugin.
+ * Update patches, changes:
+ - Drop 0001-fix-arm-build.patch, applied upstream
+ - Drop exclude-dxf2shp-plugin.patch, license issue fixed
+ - Drop typo changes for generated ChangeLog
+ - Refresh remaining patches
+ * Update copyright file, changes:
+ - Update copyright years for existing copyright holders
+ - Add new copyright holders
+ - Add license & copyright for embedded copies of Python nose2 & yaml
+ - Add license & copyright for new CMake modules
+ - Drop dxf2shp_converter plugin from Files-Excluded,
+ GPL-2 sources no longer included
+ - Drop files removed from upstream source
+ * Fix duplicate short description for qgis-{plugin,provider}-grass.
+ * Install man pages for qgis.bin & qbrowser.bin binaries.
+ * Add symbols file for libqgis-app2.14.0.
+ * Use versioned Breaks instead of Conflicts.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 26 Feb 2016 18:04:13 +0100
+
+qgis (2.13.0) UNRELEASED; urgency=medium
* New development version 2.13 after branch of 2.12
* add dependencies to gdal-bin, python-psycopg2, python-yaml, python-mock
diff --cc debian/rules
index d44546a,2bc6d57..3f944e2
--- a/debian/rules
+++ b/debian/rules
@@@ -131,7 -128,11 +131,7 @@@ ifneq (,$(filter parallel=%,$(DEB_BUILD
MAKEFLAGS += -j$(NUMJOBS)
endif
- ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
-ifneq (,$(WITH_GLOBE))
- CMAKE_OPTS += -DWITH_GLOBE=TRUE
-endif
-
+ ifneq (,$(findstring $(DISTRIBUTION),"sid buster stretch"))
CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git
More information about the Pkg-grass-devel
mailing list