[qgis] 02/06: Merge tag 'upstream/2.14.12+dfsg'
Bas Couwenberg
sebastic at debian.org
Fri Feb 24 15:35:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit 6e1b9532192ea742d9659281854f80b226475f4c
Merge: 274b1d8 3b34fc4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Feb 24 13:54:27 2017 +0100
Merge tag 'upstream/2.14.12+dfsg'
Upstream version 2.14.12+dfsg
Conflicts:
debian/changelog
CMakeLists.txt | 2 +-
ChangeLog | 213 +++++++
debian/changelog | 6 +
python/analysis/analysis.sip | 1 -
python/analysis/network/networkanalysis.sip | 1 -
python/core/conversions.sip | 6 +-
python/core/core.sip | 1 -
python/core/qgscoordinatetransform.sip | 3 +-
python/core/qgsfeature.sip | 2 +-
python/core/qgspallabeling.sip | 2 +-
python/core/qgsvectorlayerfeatureiterator.sip | 3 +-
python/core/raster/qgsrasterprojector.sip | 2 +-
python/gui/editorwidgets/qgsdatetimeedit.sip | 3 +-
python/gui/editorwidgets/qgsdoublespinbox.sip | 1 +
python/gui/editorwidgets/qgsspinbox.sip | 1 +
python/gui/gui.sip | 1 -
python/gui/qgslonglongvalidator.sip | 4 +-
python/plugins/processing/algs/gdal/polygonize.py | 5 +-
.../processing/algs/grass/GrassAlgorithm.py | 2 +-
python/plugins/processing/algs/help/qgis.yaml | 2 +-
.../algs/lidar/fusion/FusionAlgorithm.py | 2 +-
python/plugins/processing/algs/qgis/Merge.py | 5 +-
python/plugins/processing/core/GeoAlgorithm.py | 7 +-
python/plugins/processing/core/ProcessingConfig.py | 7 +-
python/plugins/processing/gui/BatchPanel.py | 2 +-
python/plugins/processing/gui/ConfigDialog.py | 5 +-
.../plugins/processing/modeler/ModelerAlgorithm.py | 9 +
.../plugins/processing/script/ScriptAlgorithm.py | 6 +-
python/server/qgswmsconfigparser.sip | 2 +-
python/server/qgswmsprojectparser.sip | 2 +-
python/server/server.sip | 1 -
scripts/release.pl | 13 +-
src/app/qgsfieldsproperties.cpp | 4 +-
src/core/geometry/qgscircularstringv2.cpp | 82 +--
src/core/qgsapplication.cpp | 18 +-
src/core/qgsogcutils.cpp | 11 +
src/core/symbology-ng/qgssymbollayerv2utils.cpp | 22 +-
src/gui/qgsmapcanvas.cpp | 1 +
src/server/qgsserver.cpp | 10 +-
src/server/qgswmsconfigparser.cpp | 1 +
tests/src/python/CMakeLists.txt | 1 +
tests/src/python/test_qgsserver.py | 317 ++++++++++
tests/src/python/test_qgssymbollayerv2_readsld.py | 117 ++++
.../WMS_GetMap_Background.png | Bin 0 -> 29454 bytes
.../WMS_GetMap_Background_Hex.png | Bin 0 -> 29454 bytes
.../WMS_GetMap_Basic/WMS_GetMap_Basic.png | Bin 0 -> 31254 bytes
.../WMS_GetMap_Filter/WMS_GetMap_Filter.png | Bin 0 -> 32826 bytes
.../WMS_GetMap_LayerOrder.png | Bin 0 -> 42641 bytes
.../WMS_GetMap_Opacities/WMS_GetMap_Opacities.png | Bin 0 -> 59841 bytes
.../qgis_server/WMS_GetMap_SRS/WMS_GetMap_SRS.png | Bin 0 -> 47895 bytes
.../WMS_GetMap_Selection/WMS_GetMap_Selection.png | Bin 0 -> 53116 bytes
.../WMS_GetMap_StyleCustom.png | Bin 0 -> 41270 bytes
.../WMS_GetMap_StyleCustom_mask.png | Bin 0 -> 34176 bytes
.../WMS_GetMap_StyleDefault.png | Bin 0 -> 32958 bytes
.../WMS_GetMap_StyleDefault_mask.png | Bin 0 -> 6982 bytes
.../WMS_GetMap_Transparent.png | Bin 0 -> 33000 bytes
.../WMS_GetMap_Transparent_mask.png | Bin 0 -> 864 bytes
.../WMS_GetPrint_Basic/WMS_GetPrint_Basic.png | Bin 0 -> 270757 bytes
.../WMS_GetPrint_Basic/WMS_GetPrint_Basic_mask.png | Bin 0 -> 105668 bytes
.../WMS_GetPrint_Grid/WMS_GetPrint_Grid.png | Bin 0 -> 306229 bytes
.../WMS_GetPrint_Grid/WMS_GetPrint_Grid_mask.png | Bin 0 -> 105668 bytes
.../WMS_GetPrint_Rotation.png | Bin 0 -> 338694 bytes
.../WMS_GetPrint_Rotation_mask.png | Bin 0 -> 105668 bytes
.../WMS_GetPrint_SRS/WMS_GetPrint_SRS.png | Bin 0 -> 235542 bytes
.../WMS_GetPrint_SRS/WMS_GetPrint_SRS_mask.png | Bin 0 -> 105668 bytes
.../WMS_GetPrint_Scale/WMS_GetPrint_Scale.png | Bin 0 -> 206573 bytes
.../WMS_GetPrint_Scale/WMS_GetPrint_Scale_mask.png | Bin 0 -> 105668 bytes
.../WMS_GetPrint_Selection.png | Bin 0 -> 270757 bytes
.../WMS_GetPrint_Selection_mask.png | Bin 0 -> 105668 bytes
tests/testdata/geom_data.csv | 24 +-
.../testdata/qgis_server_accesscontrol/project.qgs | 685 ++++++++++++++++++++-
.../symbol_layer/external_sld/simple_streams.sld | 30 +
.../testSimpleMarkerRotation-directValue.sld | 30 +
.../testSimpleMarkerRotation-ogcLiteral.sld | 31 +
74 files changed, 1593 insertions(+), 113 deletions(-)
diff --cc debian/changelog
index eb533a9,8c2e073..3490dd0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,393 -1,87 +1,399 @@@
+ qgis (2.14.12) UNRELEASED; urgency=medium
+
+ * Release of 2.14.12
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 24 Feb 2017 13:00:10 +0100
+
-qgis (2.14.11) unstable; urgency=medium
+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
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 24 Feb 2017 13:00:10 +0100
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Refresh patches.
+ * Update symbols for amd64.
+ * Add ${python:Depends} to python-qgis-common dependencies.
-qgis (2.14.10) unstable; urgency=medium
+ -- 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
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 13 Jan 2017 13:00:08 +0100
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update symbols for amd64.
-qgis (2.14.9) unstable; urgency=medium
+ -- 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
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 16 Dec 2016 13:00:16 +0100
+ [ 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.
-qgis (2.14.8) unstable; urgency=medium
+ -- 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
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 25 Nov 2016 14:11:24 +0100
+ [ 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
-qgis (2.14.7) 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
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 21 Oct 2016 14:15:16 +0200
+ [ 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) unstable; urgency=medium
+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
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 23 Sep 2016 20:23:29 +0200
+ [ 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) unstable; urgency=medium
+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
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 26 Aug 2016 13:57:14 +0200
+ [ 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.
-qgis (2.14.4) unstable; urgency=medium
+ -- 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
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 29 Jul 2016 14:03:54 +0200
+ [ 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
-qgis (2.14.3) 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
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 08 Jul 2016 14:00:32 +0200
+ [ 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
-qgis (2.14.2) 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.
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 20 May 2016 14:05:09 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 29 Apr 2016 21:07:07 +0200
-qgis (2.14.1) unstable; urgency=medium
+qgis (2.14.1+dfsg-2) unstable; urgency=medium
- * Release of 2.14.1
+ * 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
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 29 Apr 2016 14:00:28 +0200
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
-qgis (2.14.0) unstable; urgency=medium
+ -- 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.0
+ * Release of 2.14.1
[ Bas Couwenberg ]
- * Fix removal of obsolete diversions for bother the grass plugin & provider.
+ * 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, 25 Mar 2016 13:17:00 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 09 Mar 2016 19:11:51 +0100
-qgis (2.13.0) unstable; urgency=medium
+qgis (2.14.0+dfsg0-1) unstable; urgency=medium
+
+ * 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 ]
+ * Release of 2.14.0
+
+ [ 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
--
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