[qgis] 02/06: Merge tag 'upstream/2.14.9+dfsg'
Bas Couwenberg
sebastic at debian.org
Fri Nov 25 15:36: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 3e78e6a17caca4593b15c0d1a7ab4278a1c2c29e
Merge: c0f0e41 03a6947
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Nov 25 14:33:57 2016 +0100
Merge tag 'upstream/2.14.9+dfsg'
Upstream version 2.14.9+dfsg
Conflicts:
debian/changelog
CMakeLists.txt | 2 +-
ChangeLog | 285 +++++++++++++++++++++
ci/travis/linux/qt4/script.sh | 2 +-
debian/changelog | 6 +
python/core/geometry/qgsabstractgeometryv2.sip | 4 +-
python/core/geometry/qgscircularstringv2.sip | 4 +-
python/core/geometry/qgscompoundcurvev2.sip | 4 +-
python/core/geometry/qgscurvepolygonv2.sip | 5 +-
python/core/geometry/qgscurvev2.sip | 4 +-
python/core/geometry/qgsgeometrycollectionv2.sip | 5 +-
python/core/geometry/qgslinestringv2.sip | 1 +
python/core/geometry/qgsmulticurvev2.sip | 4 +-
python/core/geometry/qgsmultilinestringv2.sip | 4 +-
python/core/geometry/qgsmultipointv2.sip | 5 +-
python/core/geometry/qgsmultipolygonv2.sip | 4 +-
python/core/geometry/qgsmultisurfacev2.sip | 4 +-
python/core/geometry/qgspointv2.sip | 1 +
python/core/geometry/qgspolygonv2.sip | 4 +-
python/core/geometry/qgssurfacev2.sip | 2 +-
python/core/symbology-ng/qgssymbollayerv2.sip | 68 +++--
python/gui/gui.sip | 1 +
python/gui/layertree/qgslayertreeview.sip | 8 +
python/gui/qgsextentgroupbox.sip | 2 +-
python/gui/qgsfiledownloader.sip | 66 +++++
python/gui/qgsgeometryrubberband.sip | 2 +-
python/plugins/processing/algs/help/qgis.yaml | 4 +-
python/plugins/processing/algs/qgis/Eliminate.py | 5 +-
python/plugins/processing/algs/qgis/Union.py | 2 +-
python/plugins/processing/algs/r/RUtils.py | 2 +-
src/app/composer/qgsattributeselectiondialog.cpp | 2 +-
src/app/nodetool/qgsmaptoolnodetool.cpp | 7 +-
src/app/qgisapp.cpp | 4 +-
src/app/qgsattributetabledialog.cpp | 4 +-
src/app/qgsfeatureaction.cpp | 32 ++-
src/app/qgsfieldcalculator.cpp | 4 +-
src/app/qgsidentifyresultsdialog.cpp | 52 ++++
src/app/qgsidentifyresultsdialog.h | 7 +
src/core/composer/qgscomposerattributetablev2.cpp | 2 +-
src/core/composer/qgscomposermapgrid.cpp | 8 +-
src/core/geometry/qgsabstractgeometryv2.h | 2 +-
src/core/geometry/qgscircularstringv2.cpp | 3 +
src/core/geometry/qgscurvepolygonv2.cpp | 23 +-
src/core/geometry/qgscurvepolygonv2.h | 1 +
src/core/geometry/qgsgeometry.cpp | 9 +-
src/core/geometry/qgsgeometrycollectionv2.cpp | 16 ++
src/core/geometry/qgsgeometrycollectionv2.h | 2 +
src/core/geometry/qgsgeometryutils.cpp | 1 +
src/core/geometry/qgsgeometryutils.h | 8 +-
src/core/geometry/qgslinestringv2.cpp | 10 +-
src/core/geometry/qgslinestringv2.h | 1 +
src/core/geometry/qgsmultipointv2.h | 1 +
src/core/geometry/qgspointv2.h | 1 +
src/core/qgsconditionalstyle.cpp | 2 +-
src/core/qgsexpression.cpp | 2 +-
src/core/qgsexpressioncontext.cpp | 4 +-
src/core/qgsogcutils.cpp | 2 +-
src/core/qgspointlocator.cpp | 2 +
src/core/qgsvectorlayerrenderer.cpp | 2 +-
src/core/qgswebpage.h | 4 +
src/core/symbology-ng/qgssymbolv2.cpp | 10 +-
src/gui/CMakeLists.txt | 3 +
.../qgsfieldconditionalformatwidget.cpp | 2 +-
src/gui/layertree/qgslayertreeview.cpp | 46 ++++
src/gui/layertree/qgslayertreeview.h | 8 +
src/gui/qgsattributedialog.cpp | 5 +-
src/gui/qgsattributedialog.h | 5 +-
src/gui/qgsextentgroupbox.h | 2 +-
src/gui/qgsfiledownloader.cpp | 203 +++++++++++++++
src/gui/qgsfiledownloader.h | 112 ++++++++
src/gui/qgsmapcanvas.cpp | 11 +-
src/gui/symbology-ng/qgssymbollayerv2widget.cpp | 2 +-
src/providers/ogr/qgsogrprovider.cpp | 34 ++-
src/providers/oracle/qgsoracleprovider.cpp | 9 +-
src/providers/spatialite/qgsspatialiteprovider.cpp | 11 +-
.../virtual/qgsvirtuallayersqlitehelper.cpp | 14 +-
.../virtual/qgsvirtuallayersqlitemodule.cpp | 2 +-
src/providers/wms/qgswmsdataitems.cpp | 33 ++-
src/providers/wms/qgswmsprovider.cpp | 3 +-
src/server/qgshostedrdsbuilder.cpp | 2 +-
src/server/qgsserverprojectparser.cpp | 45 ++++
src/server/qgsserverprojectparser.h | 3 +
src/server/qgswfsserver.cpp | 23 ++
src/server/qgswmsconfigparser.cpp | 12 +-
src/server/qgswmsprojectparser.cpp | 9 +-
src/server/qgswmsserver.cpp | 10 +
tests/src/core/testqgsgeometry.cpp | 5 +-
tests/src/core/testqgspointlocator.cpp | 43 ++++
tests/src/gui/CMakeLists.txt | 2 +-
tests/src/gui/testqgsfiledownloader.cpp | 251 ++++++++++++++++++
tests/src/python/CMakeLists.txt | 4 +
tests/src/python/qgis_wrapped_server.py | 156 +++++++++++
tests/src/python/test_authmanager_password_ows.py | 186 ++++++++++++++
tests/src/python/test_authmanager_pki_ows.py | 207 +++++++++++++++
tests/src/python/test_authmanager_pki_postgres.py | 233 +++++++++++++++++
tests/src/python/test_provider_ogr_gpkg.py | 56 +++-
tests/src/python/test_qgsfiledownloader.py | 147 +++++++++++
tests/src/python/test_qgsserver.py | 16 +-
tests/src/python/utilities.py | 23 ++
tests/testdata/qgis_server/getprojectsettings.txt | 21 +-
.../{test+project.qgs => test_project.qgs} | 239 ++++++++++-------
...roject_inspire.qgs => test_project_inspire.qgs} | 0
.../{test+project_wfs.qgs => test_project_wfs.qgs} | 0
102 files changed, 2643 insertions(+), 293 deletions(-)
diff --cc debian/changelog
index 7345e52,e11ca65..5dc7d61
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,320 -1,69 +1,326 @@@
+ qgis (2.14.9) UNRELEASED; urgency=medium
+
+ * Release of 2.14.9
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 25 Nov 2016 14:11:24 +0100
+
-qgis (2.14.8) unstable; urgency=medium
+qgis (2.14.8+dfsg-2) UNRELEASED; urgency=medium
+ * Update symbols for other architectures.
+ * Run doxygen in a subshell.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Oct 2016 01:28:05 +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
+
+ * 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) unstable; urgency=medium
+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)
-qgis (2.14.6) unstable; urgency=medium
+ -- 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+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) unstable; urgency=medium
+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
-qgis (2.14.4) unstable; 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
- -- 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+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.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
-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
--
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