[qgis] 02/05: Merge tag 'upstream/2.14.6+dfsg'
Bas Couwenberg
sebastic at debian.org
Fri Aug 26 14:25:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit 6f3a5a6ed3fed1c52c8ef64e8eb038595bff69c6
Merge: b92e52d fda1341
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Aug 26 14:13:26 2016 +0200
Merge tag 'upstream/2.14.6+dfsg'
Upstream version 2.14.6+dfsg
Conflicts:
debian/changelog
debian/control.in
.gitignore | 2 +
.travis.yml | 2 +
CMakeLists.txt | 2 +-
ChangeLog | 235 +++++++++++++++++++++
debian/changelog | 6 +
i18n/qgis_de.ts | 2 +-
python/core/qgsvectorlayer.sip | 26 ++-
python/plugins/fTools/tools/doPointsInPolygon.py | 10 +-
.../processing/algs/gdal/ogr2ogronesidebuffer.py | 26 ++-
.../plugins/processing/algs/qgis/AddTableField.py | 5 +-
.../processing/algs/qgis/AutoincrementalField.py | 5 +-
python/plugins/processing/algs/qgis/Centroids.py | 2 +-
.../plugins/processing/algs/qgis/CheckValidity.py | 9 +-
python/plugins/processing/algs/qgis/ConcaveHull.py | 2 +-
python/plugins/processing/algs/qgis/ConvexHull.py | 2 +-
.../processing/algs/qgis/DensifyGeometries.py | 5 +-
python/plugins/processing/algs/qgis/Difference.py | 4 +-
python/plugins/processing/algs/qgis/Dissolve.py | 5 +-
python/plugins/processing/algs/qgis/Eliminate.py | 9 +-
.../processing/algs/qgis/EquivalentNumField.py | 5 +-
python/plugins/processing/algs/qgis/Explode.py | 3 +-
.../processing/algs/qgis/ExportGeometryInfo.py | 2 +-
.../processing/algs/qgis/ExtractByLocation.py | 2 +-
.../plugins/processing/algs/qgis/FieldPyculator.py | 7 +-
.../processing/algs/qgis/FieldsCalculator.py | 5 +-
.../plugins/processing/algs/qgis/FieldsMapper.py | 3 +-
.../plugins/processing/algs/qgis/Intersection.py | 5 +-
.../plugins/processing/algs/qgis/JoinAttributes.py | 3 +-
python/plugins/processing/algs/qgis/Merge.py | 10 +-
.../processing/algs/qgis/MultipartToSingleparts.py | 20 +-
.../algs/qgis/OrientedMinimumBoundingBox.py | 5 +-
.../processing/algs/qgis/PointsDisplacement.py | 5 +-
.../processing/algs/qgis/PointsInPolygon.py | 7 +-
.../processing/algs/qgis/PointsInPolygonUnique.py | 5 +-
.../algs/qgis/PointsInPolygonWeighted.py | 7 +-
.../processing/algs/qgis/PointsLayerFromTable.py | 3 +-
.../plugins/processing/algs/qgis/PointsToPaths.py | 2 +-
python/plugins/processing/algs/qgis/Polygonize.py | 3 +-
.../processing/algs/qgis/RandomPointsAlongLines.py | 2 +-
.../processing/algs/qgis/RandomPointsLayer.py | 2 +-
.../algs/qgis/RandomPointsPolygonsFixed.py | 2 +-
.../algs/qgis/RandomPointsPolygonsVariable.py | 2 +-
.../processing/algs/qgis/ReverseLineDirection.py | 3 +-
.../processing/algs/qgis/SaveSelectedFeatures.py | 5 +-
.../algs/qgis/SinglePartsToMultiparts.py | 2 +-
python/plugins/processing/algs/qgis/Smooth.py | 3 +-
python/plugins/processing/algs/qgis/SpatialJoin.py | 9 +-
python/plugins/processing/algs/qgis/SumLines.py | 6 +-
.../processing/algs/qgis/SymmetricalDifference.py | 13 +-
python/plugins/processing/algs/qgis/Union.py | 6 +-
python/plugins/processing/algs/qgis/VectorSplit.py | 2 +-
.../processing/algs/qgis/ZonalStatistics.py | 2 +-
.../plugins/processing/gui/AlgorithmDialogBase.py | 3 +
python/plugins/processing/gui/SilentProgress.py | 8 +-
python/testing/__init__.py | 5 +-
src/app/pluginmanager/qgspluginmanager.cpp | 2 +-
src/app/qgisapp.cpp | 4 +-
src/app/qgsdxfexportdialog.cpp | 8 +-
src/core/pal/feature.cpp | 80 ++++---
src/core/pal/feature.h | 6 +-
src/core/pal/geomfunction.cpp | 53 +++++
src/core/pal/geomfunction.h | 12 ++
src/core/pal/layer.cpp | 2 +-
src/core/pal/layer.h | 16 --
src/core/pal/pointset.cpp | 45 +---
src/core/qgsgml.cpp | 14 ++
src/core/qgslabelfeature.cpp | 24 +++
src/core/qgslabelfeature.h | 34 +++
src/core/qgslabelingenginev2.cpp | 3 -
src/core/qgslabelingenginev2.h | 1 -
src/core/qgsnetworkaccessmanager.cpp | 17 +-
src/core/qgspallabeling.cpp | 15 ++
src/core/qgsrulebasedlabeling.cpp | 2 -
src/core/qgsvectorlayer.cpp | 77 ++++++-
src/core/qgsvectorlayer.h | 26 ++-
src/core/qgsvectorlayerlabelprovider.cpp | 1 -
src/gui/CMakeLists.txt | 19 ++
src/gui/attributetable/qgsfeaturelistview.cpp | 3 +-
src/providers/ogr/qgsogrfeatureiterator.cpp | 49 +++--
src/providers/ogr/qgsogrfeatureiterator.h | 8 +-
src/providers/spatialite/qgsspatialiteprovider.cpp | 49 ++---
src/providers/wcs/qgswcscapabilities.cpp | 35 +++
src/providers/wcs/qgswcscapabilities.h | 3 +
src/providers/wcs/qgswcsprovider.cpp | 27 +++
src/providers/wcs/qgswcsprovider.h | 10 +
src/providers/wfs/qgswfscapabilities.cpp | 31 +++
src/providers/wfs/qgswfscapabilities.h | 3 +
src/providers/wfs/qgswfsprovider.cpp | 23 ++
src/providers/wfs/qgswfsprovider.h | 10 +
src/providers/wms/qgswmscapabilities.cpp | 22 +-
src/providers/wms/qgswmscapabilities.h | 9 +
src/providers/wms/qgswmsprovider.cpp | 2 +
src/server/qgsserver.cpp | 4 +-
src/server/qgswfsserver.cpp | 27 ++-
src/server/qgswmsserver.cpp | 4 +
tests/src/python/providertestbase.py | 26 +++
tests/src/python/test_qgsfeatureiterator.py | 9 +-
tests/src/python/test_qgspallabeling_placement.py | 1 +
tests/src/python/test_qgsserver.py | 93 ++++++--
...eature_nobbox.txt => wfs_getfeature_limit2.txt} | 19 +-
.../testdata/qgis_server/wfs_getfeature_nobbox.txt | 2 +-
...index2.txt => wfs_getfeature_start1_limit1.txt} | 14 +-
.../qgis_server/wfs_getfeature_startindex2.txt | 2 +-
103 files changed, 1115 insertions(+), 367 deletions(-)
diff --cc debian/changelog
index 01225a7,4941a01..11c3014
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,221 -1,51 +1,227 @@@
+ qgis (2.14.6) UNRELEASED; urgency=medium
+
+ * Release of 2.14.6
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 26 Aug 2016 13:57:14 +0200
+
-qgis (2.14.5) unstable; urgency=medium
+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
- -- 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.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 24 Jul 2016 19:17:15 +0200
+
+qgis (2.14.4+dfsg-1) unstable; urgency=medium
-qgis (2.14.4) 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) unstable; urgency=medium
+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
- -- 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
-qgis (2.14.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)
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 20 May 2016 14:05:09 +0200
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Bump Standards-Version to 3.9.8, no changes.
+ * Update symbols for amd64.
-qgis (2.14.1) unstable; urgency=medium
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 29 Apr 2016 21:07:07 +0200
- * Release of 2.14.1
+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
- -- 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