[qgis] 02/06: Merge tag 'upstream/2.14.7+dfsg'
Bas Couwenberg
sebastic at debian.org
Sat Sep 24 07:46:04 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 5d7a4eb8b8f7120366b81186f0f7879b84ec6085
Merge: 37bf42c 32a1925
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Sep 24 08:48:43 2016 +0200
Merge tag 'upstream/2.14.7+dfsg'
Upstream version 2.14.7+dfsg
Conflicts:
debian/changelog
debian/python-qgis.install.in
CMakeLists.txt | 2 +-
ChangeLog | 826 ++++++++++++++-------
debian/changelog | 6 +
debian/rules | 4 +
python/CMakeLists.txt | 12 +
python/QtWebKit/QtWebKitmod.sip | 63 ++
python/QtWebKit/__init__.py | 0
python/QtWebKit/qgraphicswebview.sip | 150 ++++
python/QtWebKit/qwebdatabase.sip | 46 ++
python/QtWebKit/qwebelement.sip | 144 ++++
python/QtWebKit/qwebframe.sip | 244 ++++++
python/QtWebKit/qwebhistory.sip | 104 +++
python/QtWebKit/qwebhistoryinterface.sip | 40 +
python/QtWebKit/qwebinspector.sip | 48 ++
python/QtWebKit/qwebkitglobal.sip | 37 +
python/QtWebKit/qwebkitversion.sip | 37 +
python/QtWebKit/qwebpage.sip | 522 +++++++++++++
python/QtWebKit/qwebpluginfactory.sip | 88 +++
python/QtWebKit/qwebsecurityorigin.sip | 56 ++
python/QtWebKit/qwebsettings.sip | 237 ++++++
python/QtWebKit/qwebview.sip | 167 +++++
python/core/geometry/qgsabstractgeometryv2.sip | 6 +
python/core/geometry/qgslinestringv2.sip | 4 +
python/core/geometry/qgsmultilinestringv2.sip | 4 +
python/core/geometry/qgsmultipolygonv2.sip | 4 +
python/core/geometry/qgspolygonv2.sip | 4 +
python/core/qgsstringutils.sip | 19 +
python/core/qgsvectordataprovider.sip | 4 +
python/gui/qgsmessagebar.sip | 4 +-
python/plugins/processing/algs/qgis/ConcaveHull.py | 4 +-
.../plugins/processing/algs/qgis/Intersection.py | 6 +-
python/plugins/processing/algs/qgis/MeanCoords.py | 11 +-
.../algs/qgis/SinglePartsToMultiparts.py | 4 +-
python/plugins/processing/core/parameters.py | 2 +-
.../plugins/processing/gui/AlgorithmDialogBase.py | 3 -
.../processing/ui/DlgGetScriptsAndModels.ui | 5 -
src/analysis/vector/qgsgeometryanalyzer.cpp | 59 +-
src/analysis/vector/qgsgeometryanalyzer.h | 10 +-
src/app/main.cpp | 94 ++-
src/app/qgsidentifyresultsdialog.cpp | 2 +
src/app/qgssnappingdialog.cpp | 2 +-
src/core/auth/qgsauthmanager.cpp | 8 +-
src/core/geometry/qgsabstractgeometryv2.h | 6 +
src/core/geometry/qgsgeometry.cpp | 5 +
src/core/geometry/qgslinestringv2.cpp | 8 +
src/core/geometry/qgslinestringv2.h | 3 +
src/core/geometry/qgsmultilinestringv2.cpp | 11 +
src/core/geometry/qgsmultilinestringv2.h | 3 +
src/core/geometry/qgsmultipolygonv2.cpp | 10 +
src/core/geometry/qgsmultipolygonv2.h | 3 +
src/core/geometry/qgspolygonv2.cpp | 12 +
src/core/geometry/qgspolygonv2.h | 3 +
src/core/qgsexpression.cpp | 14 +-
src/core/qgslegendrenderer.cpp | 46 +-
src/core/qgspallabeling.cpp | 71 +-
src/core/qgspointlocator.cpp | 1 +
src/core/qgspointlocator.h | 2 +-
src/core/qgsstringutils.cpp | 50 ++
src/core/qgsstringutils.h | 18 +
src/core/qgsvectordataprovider.cpp | 109 ++-
src/core/qgsvectordataprovider.h | 4 +
src/core/qgsvectorlayer.cpp | 7 +-
src/core/qgsvectorlayerfeatureiterator.cpp | 287 ++++---
src/core/qgsvectorlayerfeatureiterator.h | 29 +-
src/core/qgsvectorlayerlabelprovider.h | 2 +
src/core/symbology-ng/qgsvectorcolorrampv2.cpp | 5 +-
src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp | 1 +
.../qgsdelimitedtextfeatureiterator.cpp | 10 +-
.../delimitedtext/qgsdelimitedtextfile.cpp | 10 +-
src/providers/ogr/qgsogrconnpool.h | 3 +-
src/providers/ogr/qgsogrfeatureiterator.cpp | 7 +
src/providers/ogr/qgsogrprovider.cpp | 177 ++++-
src/providers/ogr/qgsogrprovider.h | 8 +
src/providers/postgres/qgspostgresdataitems.cpp | 8 +-
src/providers/postgres/qgspostgresprovider.cpp | 7 +-
.../spatialite/qgsspatialitesourceselect.cpp | 4 +
.../virtual/qgsvirtuallayerqueryparser.cpp | 6 +-
.../virtual/qgsvirtuallayersqlitemodule.cpp | 19 +-
tests/src/core/testqgsexpression.cpp | 1 +
tests/src/core/testqgslabelingenginev2.cpp | 60 ++
tests/src/core/testqgslegendrenderer.cpp | 62 ++
tests/src/python/test_provider_ogr_gpkg.py | 164 ++++
tests/src/python/test_provider_virtual.py | 14 +
tests/src/python/test_qgsfeatureiterator.py | 88 ++-
.../expected_legend_2_by_2.png | Bin 0 -> 4515 bytes
.../expected_legend_2_by_2_mask.png | Bin 0 -> 1198 bytes
.../expected_legend_3_by_2.png | Bin 0 -> 5364 bytes
.../expected_legend_3_by_2_mask.png | Bin 0 -> 1491 bytes
.../expected_legend_3_by_3.png | Bin 0 -> 5800 bytes
.../expected_legend_3_by_3_mask.png | Bin 0 -> 1526 bytes
.../expected_legend_4_by_2.png | Bin 0 -> 5472 bytes
.../expected_legend_4_by_2_mask.png | Bin 0 -> 1676 bytes
.../expected_legend_4_by_3.png | Bin 0 -> 6529 bytes
.../expected_legend_4_by_3_mask.png | Bin 0 -> 1855 bytes
.../expected_legend_5_by_2.png | Bin 0 -> 6661 bytes
.../expected_legend_5_by_2_mask.png | Bin 0 -> 1964 bytes
.../expected_legend_5_by_3.png | Bin 0 -> 6870 bytes
.../expected_legend_5_by_3_mask.png | Bin 0 -> 2045 bytes
.../expected_legend_6_by_3.png | Bin 0 -> 7470 bytes
.../expected_legend_6_by_3_mask.png | Bin 0 -> 2226 bytes
.../expected_legend_7_by_3.png | Bin 0 -> 8244 bytes
.../expected_legend_7_by_3_mask.png | Bin 0 -> 2539 bytes
102 files changed, 3891 insertions(+), 559 deletions(-)
diff --cc debian/changelog
index ec9302a,97463cb..3a89c0b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,262 -1,57 +1,268 @@@
+ qgis (2.14.7) UNRELEASED; urgency=medium
+
+ * Release of 2.14.7
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 23 Sep 2016 20:23:30 +0200
+
-qgis (2.14.6) unstable; urgency=medium
+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
- -- 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) 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
+
+ [ 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) unstable; urgency=medium
+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
+
+ * Update symbols for arm64 mips mipsel powerpc ppc64el s390x.
+ * Move from experimental to unstable.
-qgis (2.14.3) unstable; urgency=medium
+ -- 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) unstable; urgency=medium
+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.
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 29 Apr 2016 14:00:28 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 07 Apr 2016 07:10:22 +0200
-qgis (2.14.0) unstable; urgency=medium
+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.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.14.0+dfsg0-1) unstable; urgency=medium
-qgis (2.13.0) 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