[qgis] 02/08: Merge tag 'upstream/2.14.2+dfsg'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Apr 29 20:22: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 41b5faeb923803c2de0c9119f71f53b2c56af797
Merge: 06f3c21 435e2ec
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Apr 29 16:03:05 2016 +0200
Merge tag 'upstream/2.14.2+dfsg'
Upstream version 2.14.2+dfsg
Conflicts:
debian/changelog
debian/control.in
debian/python-qgis.install.in
.travis.yml | 20 +-
CMakeLists.txt | 2 +-
ChangeLog | 512 ++++++++++++++++++++-
debian/changelog | 6 +
debian/rules | 4 +
ms-windows/osgeo4w/browser.bat.tmpl | 1 +
python/core/composer/qgscomposertablev2.sip | 5 +-
python/core/conversions.sip | 29 --
python/core/qgis.sip | 11 +
python/core/qgsdataprovider.sip | 5 +
python/core/qgsnetworkaccessmanager.sip | 20 +
python/core/qgstracer.sip | 5 +
python/core/symbology-ng/qgssymbolv2.sip | 75 ++-
.../db_manager/db_plugins/postgis/connector.py | 10 +-
.../plugins/processing/algs/gdal/ClipByExtent.py | 14 +-
python/plugins/processing/algs/gdal/ClipByMask.py | 14 +-
.../plugins/processing/algs/gdal/GdalAlgorithm.py | 13 +-
.../algs/gdal/GdalOgrAlgorithmProvider.py | 2 +-
python/plugins/processing/algs/gdal/contour.py | 6 +-
python/plugins/processing/algs/gdal/gdalcalc.py | 14 +-
python/plugins/processing/algs/gdal/rasterize.py | 14 +-
python/plugins/processing/algs/gdal/translate.py | 14 +-
python/plugins/processing/algs/gdal/warp.py | 14 +-
.../processing/algs/grass/GrassAlgorithm.py | 2 +-
.../algs/grass/GrassAlgorithmProvider.py | 2 +-
python/plugins/processing/algs/grass/GrassUtils.py | 8 +-
.../processing/algs/grass7/Grass7Algorithm.py | 2 +-
.../algs/grass7/Grass7AlgorithmProvider.py | 7 +-
.../plugins/processing/algs/grass7/Grass7Utils.py | 17 +-
.../processing/algs/otb/OTBSpecific_XMLLoading.py | 3 +-
python/plugins/processing/algs/otb/OTBUtils.py | 15 +-
python/plugins/processing/algs/qgis/Buffer.py | 4 +-
python/plugins/processing/algs/qgis/Dissolve.py | 17 +-
.../plugins/processing/algs/qgis/JoinAttributes.py | 2 +-
.../processing/algs/qgis/QGISAlgorithmProvider.py | 2 +-
.../processing/algs/qgis/ZonalStatistics.py | 24 +-
python/plugins/processing/algs/r/RAlgorithm.py | 2 +-
.../processing/algs/r/RAlgorithmProvider.py | 2 +-
python/plugins/processing/algs/r/RUtils.py | 13 +-
.../processing/algs/taudem/TauDEMAlgorithm.py | 2 +-
.../algs/taudem/TauDEMAlgorithmProvider.py | 2 +-
.../plugins/processing/algs/taudem/dinfdistdown.py | 2 +-
.../processing/algs/taudem/dinfdistdown_multi.py | 2 +-
.../plugins/processing/algs/taudem/dinfdistup.py | 2 +-
.../processing/algs/taudem/dinfdistup_multi.py | 2 +-
.../processing/algs/taudem/dinftranslimaccum.py | 2 +-
.../processing/algs/taudem/dinftranslimaccum2.py | 2 +-
.../algs/taudem/dinftranslimaccum2_multi.py | 2 +-
.../algs/taudem/dinftranslimaccum_multi.py | 2 +-
.../plugins/processing/algs/taudem/dropanalysis.py | 2 +-
.../processing/algs/taudem/dropanalysis_multi.py | 2 +-
python/plugins/processing/algs/taudem/gridnet.py | 2 +-
.../processing/algs/taudem/gridnet_multi.py | 2 +-
.../plugins/processing/algs/taudem/lengtharea.py | 2 +-
.../processing/algs/taudem/lengtharea_multi.py | 2 +-
.../processing/algs/taudem/peukerdouglas.py | 2 +-
.../processing/algs/taudem/peukerdouglas_multi.py | 2 +-
python/plugins/processing/algs/taudem/slopearea.py | 2 +-
.../processing/algs/taudem/slopearea_multi.py | 2 +-
python/plugins/processing/core/GeoAlgorithm.py | 3 +-
.../processing/gui/CreateNewScriptAction.py | 2 +-
.../plugins/processing/gui/GetScriptsAndModels.py | 4 +-
python/plugins/processing/gui/ProcessingToolbox.py | 2 -
python/plugins/processing/images/CMakeLists.txt | 2 +-
python/plugins/processing/images/gdal.png | Bin 734 -> 0 bytes
python/plugins/processing/images/gdal.svg | 126 +++++
python/plugins/processing/images/grass.png | Bin 750 -> 0 bytes
python/plugins/processing/images/grass.svg | 271 +++++++++++
python/plugins/processing/images/qgis.png | Bin 785 -> 0 bytes
python/plugins/processing/images/qgis.svg | 286 ++++++++++++
python/plugins/processing/images/r.png | Bin 829 -> 0 bytes
python/plugins/processing/images/r.svg | 14 +
python/plugins/processing/images/taudem.png | Bin 1030 -> 0 bytes
python/plugins/processing/images/taudem.svg | 196 ++++++++
.../plugins/processing/modeler/ModelerAlgorithm.py | 9 +-
.../processing/modeler/ModelerParametersDialog.py | 8 +-
python/testing/CMakeLists.txt | 2 +-
src/app/qgisapp.cpp | 5 +-
src/app/qgsattributetabledialog.cpp | 4 +-
src/app/qgsrasterlayerproperties.cpp | 19 +-
src/app/qgsrasterlayerproperties.h | 7 +
src/app/qgsstatisticalsummarydockwidget.cpp | 2 +-
src/app/qgsvectorlayerproperties.cpp | 14 +-
src/app/qgsvectorlayerproperties.h | 5 +
src/core/composer/qgsatlascomposition.cpp | 19 +-
src/core/composer/qgscomposerattributetable.cpp | 56 +--
src/core/composer/qgscomposerattributetablev2.cpp | 56 +--
src/core/composer/qgscomposermap.cpp | 8 +
src/core/composer/qgscomposertablev2.cpp | 18 +-
src/core/composer/qgscomposertablev2.h | 3 +-
src/core/geometry/qgsgeometry.cpp | 6 +-
src/core/layertree/qgslayertreemodellegendnode.cpp | 4 +-
src/core/qgis.cpp | 41 ++
src/core/qgis.h | 14 +-
src/core/qgsdataprovider.h | 5 +
src/core/qgsexpression.cpp | 8 +
src/core/qgsexpressioncontext.cpp | 3 +
src/core/qgsmaplayer.cpp | 40 +-
src/core/qgsnetworkaccessmanager.cpp | 18 +
src/core/qgsnetworkaccessmanager.h | 19 +
src/core/qgsofflineediting.cpp | 88 ++--
src/core/qgspallabeling.cpp | 330 +++++++++----
src/core/qgstracer.cpp | 36 +-
src/core/qgstracer.h | 8 +
src/core/qgsvectordataprovider.cpp | 14 +
src/core/qgsvectorlayer.cpp | 69 ++-
src/core/qgsvectorlayerlabelprovider.cpp | 4 +-
src/core/symbology-ng/qgsellipsesymbollayerv2.cpp | 26 +-
src/core/symbology-ng/qgssymbollayerv2utils.cpp | 34 --
src/core/symbology-ng/qgssymbolv2.cpp | 70 ++-
src/core/symbology-ng/qgssymbolv2.h | 76 ++-
.../qgsattributetablefiltermodel.cpp | 36 +-
.../editorwidgets/qgsrelationreferencewidget.cpp | 22 +-
.../qgsvaluerelationwidgetwrapper.cpp | 15 +-
src/gui/qgsfieldexpressionwidget.cpp | 6 +-
src/gui/qgsmapcanvastracer.cpp | 5 +
src/gui/qgsnewnamedialog.cpp | 3 +
src/plugins/CMakeLists.txt | 1 +
src/plugins/globe/CMakeLists.txt | 3 +
src/plugins/globe/globe_plugin.cpp | 17 +-
.../qgsdelimitedtextfeatureiterator.cpp | 22 +-
.../delimitedtext/qgsdelimitedtextprovider.cpp | 3 +-
src/providers/memory/qgsmemoryfeatureiterator.cpp | 6 +-
src/providers/memory/qgsmemoryprovider.cpp | 1 +
src/providers/mssql/qgsmssqlfeatureiterator.cpp | 23 +-
src/providers/ogr/qgsogrfeatureiterator.cpp | 12 +
src/providers/oracle/qgsoraclefeatureiterator.cpp | 174 +++++--
src/providers/oracle/qgsoraclefeatureiterator.h | 1 +
.../postgres/qgspostgresfeatureiterator.cpp | 13 +
.../spatialite/qgsspatialitefeatureiterator.cpp | 13 +
src/providers/spatialite/qgsspatialiteprovider.cpp | 5 +-
src/providers/spatialite/qgsspatialiteprovider.h | 2 +
.../virtual/qgsvirtuallayerfeatureiterator.cpp | 16 +-
src/providers/virtual/qgsvirtuallayerprovider.cpp | 1 +
src/providers/wfs/qgswfsprovider.cpp | 89 +---
src/server/qgsconfigparserutils.cpp | 16 +-
src/server/qgsserverprojectparser.cpp | 2 +-
src/server/qgswfsserver.cpp | 12 +
src/ui/composer/qgscomposerlegendwidgetbase.ui | 10 +-
tests/src/core/testqgis.cpp | 68 +++
tests/src/core/testqgslegendrenderer.cpp | 37 ++
tests/src/core/testqgssimplemarker.cpp | 54 +++
tests/src/gui/testqgsfieldexpressionwidget.cpp | 57 +++
tests/src/python/providertestbase.py | 70 +++
tests/src/python/test_provider_memory.py | 2 +-
.../python/test_qgsdelimitedtextprovider_wanted.py | 54 +++
.../expected_legend_mapunits.png | Bin 0 -> 11060 bytes
.../expected_legend_mapunits_mask.png | Bin 0 -> 2192 bytes
.../expected_simplemarker_boundsoffset.png | Bin 0 -> 11019 bytes
.../expected_simplemarker_boundsoffset_mask.png | Bin 0 -> 5329 bytes
.../expected_simplemarker_boundsrotation.png | Bin 0 -> 19177 bytes
.../expected_simplemarker_boundsrotation_mask.png | Bin 0 -> 6115 bytes
.../expected_simplemarker_boundsrotationoffset.png | Bin 0 -> 11845 bytes
...cted_simplemarker_boundsrotationoffset_mask.png | Bin 0 -> 3576 bytes
tests/testdata/delimitedtext/test14666.csv | 7 +
155 files changed, 3153 insertions(+), 751 deletions(-)
diff --cc debian/changelog
index 751a354,2c0290e..2ac6606
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,95 -1,27 +1,101 @@@
+ qgis (2.14.2) UNRELEASED; urgency=medium
+
+ * Release of 2.14.2
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 29 Apr 2016 14:00:28 +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.
- -- 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.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
-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