[qgis] 02/05: Merge tag 'upstream/2.14.5+dfsg'
Bas Couwenberg
sebastic at debian.org
Fri Jul 29 14:56:44 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 7b34f2405008e9f89838c771497c16cd7f37b107
Merge: a51de8a e410ce6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jul 29 14:16:55 2016 +0200
Merge tag 'upstream/2.14.5+dfsg'
Upstream version 2.14.5+dfsg
Conflicts:
debian/changelog
.travis.yml | 73 ++-
CMakeLists.txt | 2 +-
ChangeLog | 490 +++++++++++++++++++++
ci/travis/linux/after_script.sh | 15 +
ci/travis/linux/before_install.sh | 80 +---
ci/travis/linux/before_script.sh | 15 +
ci/travis/linux/install.sh | 34 +-
ci/travis/linux/qt4/before_install.sh | 24 +
ci/travis/linux/qt4/install.sh | 59 +++
ci/travis/linux/qt4/script.sh | 27 ++
ci/travis/linux/script.sh | 20 +-
ci/travis/osx/before_install.sh | 28 +-
ci/travis/osx/install.sh | 37 +-
ci/travis/osx/script.sh | 21 +-
cmake/SIPMacros.cmake | 6 +
debian/changelog | 6 +
python/PyQt/CMakeLists.txt | 1 +
python/core/composer/qgscomposerlegend.sip | 14 +
python/core/composer/qgscomposition.sip | 5 +
python/core/core.sip | 1 +
python/core/qgsannotation.sip | 64 +++
python/core/qgsapplication.sip | 16 +
python/core/qgsexpressioncontext.sip | 7 +
python/core/qgsnetworkaccessmanager.sip | 2 +-
python/core/qgsproject.sip | 14 +
python/gui/qgsannotationitem.sip | 26 +-
python/plugins/processing/ProcessingPlugin.py | 2 +-
.../plugins/processing/algs/gdal/GdalAlgorithm.py | 5 +-
python/plugins/processing/algs/qgis/Buffer.py | 14 +-
python/plugins/processing/algs/qgis/Difference.py | 22 +-
.../processing/modeler/ModelerParametersDialog.py | 17 +-
python/plugins/processing/tools/dataobjects.py | 18 +-
src/analysis/raster/qgsninecellfilter.cpp | 16 +-
src/analysis/raster/qgsrastercalculator.cpp | 2 +-
src/analysis/raster/qgsrelief.cpp | 45 +-
src/analysis/vector/qgszonalstatistics.cpp | 6 +-
src/app/composer/qgsatlascompositionwidget.cpp | 3 +-
src/app/composer/qgscomposer.cpp | 74 ++--
src/app/composer/qgscomposer.h | 9 +-
src/app/composer/qgscomposeritemwidget.cpp | 26 +-
src/app/composer/qgscomposeritemwidget.h | 3 +-
src/app/composer/qgscomposerlegendwidget.cpp | 21 +
src/app/composer/qgscomposerlegendwidget.h | 1 +
src/app/composer/qgscomposermanager.cpp | 13 +-
src/app/composer/qgscompositionwidget.cpp | 25 +-
src/app/composer/qgscompositionwidget.h | 2 +
src/app/qgisapp.cpp | 6 +-
src/app/qgsannotationwidget.cpp | 22 +-
src/app/qgsannotationwidget.h | 7 +-
src/app/qgsattributetabledialog.cpp | 1 -
src/app/qgsformannotationdialog.cpp | 1 -
src/app/qgshtmlannotationdialog.cpp | 1 -
src/app/qgsoptions.cpp | 28 +-
src/app/qgsprojectproperties.cpp | 3 +-
src/app/qgssvgannotationdialog.cpp | 1 -
src/app/qgstextannotationdialog.cpp | 15 +-
src/app/qgstextannotationdialog.h | 5 +
src/core/CMakeLists.txt | 1 +
src/core/composer/qgsatlascomposition.cpp | 5 +-
src/core/composer/qgscomposerlegend.cpp | 85 +++-
src/core/composer/qgscomposerlegend.h | 23 +
src/core/composer/qgscomposermap.cpp | 66 ++-
src/core/composer/qgscomposermap.h | 5 +-
src/core/composer/qgscomposition.cpp | 5 +
src/core/composer/qgscomposition.h | 5 +
src/core/geometry/qgsgeometry.cpp | 2 +-
src/core/pal/feature.cpp | 13 +-
src/core/pal/layer.cpp | 29 +-
src/core/qgsannotation.h | 90 ++++
src/core/qgsapplication.cpp | 5 +
src/core/qgsapplication.h | 16 +
src/core/qgsexpressioncontext.cpp | 13 +
src/core/qgsexpressioncontext.h | 7 +
src/core/qgsmaplayerregistry.cpp | 35 +-
src/core/qgsmaplayerregistry.h | 4 +-
src/core/qgsnetworkaccessmanager.cpp | 6 +-
src/core/qgsnetworkaccessmanager.h | 2 +-
src/core/qgsofflineediting.cpp | 28 +-
src/core/qgspallabeling.cpp | 7 +-
src/core/qgsproject.cpp | 4 +
src/core/qgsproject.h | 14 +
.../editorwidgets/qgsrelationreferencewidget.cpp | 2 +-
src/gui/qgsannotationitem.cpp | 48 +-
src/gui/qgsannotationitem.h | 36 +-
src/gui/qgscredentialdialog.cpp | 2 +
src/gui/qgsvariableeditorwidget.h | 14 +-
src/plugins/heatmap/heatmap.cpp | 19 +-
.../oracle/ocispatial/qsql_ocispatial.cpp | 2 +-
src/providers/oracle/qgsoracleconn.cpp | 2 +-
src/providers/oracle/qgsoracleconn.h | 6 +-
src/providers/oracle/qgsoracleconnpool.h | 2 +-
src/providers/oracle/qgsoracleprovider.cpp | 14 +-
src/providers/oracle/qgsoracleprovider.h | 1 -
src/providers/wcs/qgswcsprovider.cpp | 20 +-
src/providers/wms/CMakeLists.txt | 6 +
src/providers/wms/qgswmscapabilities.cpp | 11 +
src/providers/wms/qgswmsprovider.cpp | 68 ++-
src/python/qgspythonutilsimpl.cpp | 9 -
src/python/qgspythonutilsimpl.h | 3 -
src/server/qgsowsserver.h | 2 +
src/server/qgswmsprojectparser.cpp | 5 +
src/ui/composer/qgscomposerlegendwidgetbase.ui | 10 +-
src/ui/qgscredentialdialog.ui | 8 +
src/ui/qgsoptionsbase.ui | 2 +-
src/ui/qgsprojectpropertiesbase.ui | 178 ++------
tests/src/analysis/testqgsalignraster.cpp | 4 +-
tests/src/core/testqgsapplication.cpp | 1 +
tests/src/core/testqgscomposition.cpp | 15 +
.../src/core/testqgscoordinatereferencesystem.cpp | 6 +
tests/src/core/testqgsdistancearea.cpp | 3 +-
tests/src/core/testqgsexpressioncontext.cpp | 12 +
tests/src/core/testqgsgeometry.cpp | 16 +
tests/src/core/testqgsproject.cpp | 8 +
tests/src/core/testqgsrasterlayer.cpp | 5 +-
tests/src/providers/CMakeLists.txt | 9 +
tests/src/providers/testqgswmscapabilities.cpp | 70 +++
tests/src/providers/testqgswmsprovider.cpp | 69 +++
tests/src/python/CMakeLists.txt | 1 +
tests/src/python/test_qgscomposerlegend.py | 203 +++++++++
tests/src/python/test_qgspallabeling_tests.py | 16 +
tests/src/python/utilities.py | 12 +
.../expected_composer_legend_mapunits.png | Bin 0 -> 16960 bytes
.../expected_composer_legend_mapunits_mask.png | Bin 0 -> 6230 bytes
.../expected_composer_legend_noresize.png | Bin 0 -> 9350 bytes
.../expected_composer_legend_noresize_mask.png | Bin 0 -> 6483 bytes
.../expected_composer_legend_noresize_crop.png | Bin 0 -> 7177 bytes
...expected_composer_legend_noresize_crop_mask.png | Bin 0 -> 5598 bytes
.../expected_composer_legend_size_content.png | Bin 0 -> 9364 bytes
.../expected_composer_legend_size_content_mask.png | Bin 0 -> 6085 bytes
.../sp_letter_spacing/sp_letter_spacing.png | Bin 0 -> 5217 bytes
.../sp_letter_spacing/sp_letter_spacing_mask.png | Bin 0 -> 1857 bytes
.../sp_word_spacing/sp_word_spacing.png | Bin 0 -> 5316 bytes
.../sp_word_spacing/sp_word_spacing_mask.png | Bin 0 -> 1857 bytes
.../sp_curved_placement_above.png | Bin 13289 -> 12116 bytes
.../sp_curved_placement_above_mask.png | Bin 8892 -> 3494 bytes
.../sp_curved_placement_below.png | Bin 13273 -> 12044 bytes
.../sp_curved_placement_below_mask.png | Bin 9798 -> 3625 bytes
.../sp_curved_placement_online.png | Bin 12247 -> 11014 bytes
.../sp_curved_placement_online_mask.png | Bin 9404 -> 10684 bytes
.../sp_img_letter_spacing.png | Bin 0 -> 5210 bytes
.../sp_img_letter_spacing_mask.png | Bin 0 -> 1868 bytes
.../sp_img_word_spacing/sp_img_word_spacing.png | Bin 0 -> 5305 bytes
.../sp_img_word_spacing_mask.png | Bin 0 -> 1864 bytes
.../sp_pdf_letter_spacing.png | Bin 0 -> 5214 bytes
.../sp_pdf_letter_spacing_mask.png | Bin 0 -> 1893 bytes
.../sp_pdf_word_spacing/sp_pdf_word_spacing.png | Bin 0 -> 5352 bytes
.../sp_pdf_word_spacing_mask.png | Bin 0 -> 1985 bytes
.../sp_svg_letter_spacing.png | Bin 0 -> 5205 bytes
.../sp_svg_letter_spacing_mask.png | Bin 0 -> 2657 bytes
.../sp_svg_word_spacing/sp_svg_word_spacing.png | Bin 0 -> 5331 bytes
.../sp_svg_word_spacing_mask.png | Bin 0 -> 1734 bytes
.../sp_img_curved_placement_above.png | Bin 13289 -> 12116 bytes
.../sp_img_curved_placement_above_mask.png | Bin 12103 -> 3494 bytes
.../sp_img_curved_placement_below.png | Bin 13273 -> 12044 bytes
.../sp_img_curved_placement_below_mask.png | Bin 13105 -> 3625 bytes
.../sp_img_curved_placement_online.png | Bin 12247 -> 11014 bytes
.../sp_img_curved_placement_online_mask.png | Bin 11918 -> 3398 bytes
.../sp_pdf_curved_placement_above.png | Bin 11069 -> 11536 bytes
.../sp_pdf_curved_placement_above_mask.png | Bin 11946 -> 3645 bytes
.../sp_pdf_curved_placement_below.png | Bin 11094 -> 11542 bytes
.../sp_pdf_curved_placement_below_mask.png | Bin 12864 -> 3552 bytes
.../sp_pdf_curved_placement_online.png | Bin 10389 -> 10775 bytes
.../sp_pdf_curved_placement_online_mask.png | Bin 11755 -> 3416 bytes
.../sp_svg_curved_placement_above.png | Bin 13283 -> 12108 bytes
.../sp_svg_curved_placement_above_mask.png | Bin 8829 -> 3503 bytes
.../sp_svg_curved_placement_below.png | Bin 13298 -> 12035 bytes
.../sp_svg_curved_placement_below_mask.png | Bin 9722 -> 3427 bytes
.../sp_svg_curved_placement_online.png | Bin 12239 -> 11028 bytes
.../sp_svg_curved_placement_online_mask.png | Bin 9343 -> 3044 bytes
.../sp_letter_spacing/sp_letter_spacing.png | Bin 0 -> 5214 bytes
.../sp_letter_spacing/sp_letter_spacing_mask.png | Bin 0 -> 1876 bytes
.../sp_word_spacing/sp_word_spacing.png | Bin 0 -> 5316 bytes
.../sp_word_spacing/sp_word_spacing_mask.png | Bin 0 -> 1974 bytes
.../sp_curved_placement_above.png | Bin 13289 -> 12139 bytes
.../sp_curved_placement_above_mask.png | Bin 8892 -> 2680 bytes
.../sp_curved_placement_below.png | Bin 13273 -> 12047 bytes
.../sp_curved_placement_below_mask.png | Bin 9798 -> 2648 bytes
.../sp_curved_placement_online.png | Bin 12247 -> 11016 bytes
.../sp_curved_placement_online_mask.png | Bin 9404 -> 2760 bytes
tests/testdata/provider/GetCapabilities.xml | 188 ++++++++
180 files changed, 2481 insertions(+), 598 deletions(-)
diff --cc debian/changelog
index 3b767cb,b85a92f..3388764
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,195 -1,45 +1,201 @@@
+ qgis (2.14.5) UNRELEASED; urgency=medium
+
+ * Release of 2.14.5
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 29 Jul 2016 14:03:54 +0200
+
-qgis (2.14.4) unstable; urgency=medium
+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
- -- 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) unstable; urgency=medium
+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
- -- 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
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 29 Apr 2016 14:00:28 +0200
+qgis (2.14.1+dfsg-1) unstable; urgency=medium
-qgis (2.14.0) 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
+
+ * 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