[qgis] 04/09: Merge tag 'upstream/2.14.1+dfsg'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Mar 25 17:54:18 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 7cdebf948064211970ba606445dc358ce6e8ab90
Merge: c469093 e66986d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Mar 25 14:43:22 2016 +0100
Merge tag 'upstream/2.14.1+dfsg'
Upstream version 2.14.1+dfsg
Conflicts:
debian/changelog
debian/qgis.preinst
CMakeLists.txt | 2 +-
ChangeLog | 501 +
debian/changelog | 8 +-
debian/qgis.preinst | 14 +-
doc/TRANSLATORS | 78 +-
i18n/qgis_de.ts | 10589 ++++++++++---------
images/splash/splash.png | Bin 318410 -> 318410 bytes
ms-windows/Installer-Files/WelcomeFinishPage.bmp | Bin 112180 -> 154542 bytes
ms-windows/QGIS-Installer.nsi | 4 +-
ms-windows/osgeo4w/creatensis.pl | 62 +-
ms-windows/osgeo4w/postinstall-desktop.bat | 8 +-
ms-windows/osgeo4w/postinstall-dev.bat | 12 +-
ms-windows/osgeo4w/postinstall-grass.bat | 7 +-
ms-windows/osgeo4w/preremove-desktop.bat | 18 +-
ms-windows/osgeo4w/preremove-dev.bat | 20 +-
ms-windows/osgeo4w/preremove-grass.bat | 10 +-
ms-windows/osgeo4w/preremove-server.bat | 2 +-
python/core/composer/qgscomposerpicture.sip | 51 +
python/core/qgsnetworkaccessmanager.sip | 19 -
python/core/symbology-ng/qgsrendererv2.sip | 2 +
.../symbology-ng/qgssinglesymbolrendererv2.sip | 2 +
python/core/symbology-ng/qgsstylev2.sip | 6 +
.../db_manager/db_plugins/vlayers/data_model.py | 12 +-
.../algs/grass/GrassAlgorithmProvider.py | 1 +
.../processing/algs/grass7/Grass7Algorithm.py | 29 +-
.../algs/grass7/Grass7AlgorithmProvider.py | 1 -
.../algs/grass7/description/r.viewshed.txt | 1 +
.../algs/grass7/description/v.buffer.column.txt | 1 +
.../processing/algs/qgis/FieldsCalculator.py | 16 +-
.../plugins/processing/algs/qgis/FieldsMapper.py | 27 +-
.../algs/qgis/ui/FieldsCalculatorDialog.py | 9 +
.../algs/saga/description/2.1.2/GridMasking.txt | 1 +
.../algs/saga/description/2.1.3/GridMasking.txt | 1 +
.../algs/saga/description/2.1.4/GridMasking.txt | 1 +
.../description/2.2.0/B-SplineApproximation.txt | 3 +-
.../description/2.2.0/CubicSplineApproximation.txt | 3 +-
.../algs/saga/description/2.2.0/GridMasking.txt | 1 +
.../MultilevelB-SplineInterpolation(fromGrid).txt | 3 +-
.../2.2.0/MultilevelB-SplineInterpolation.txt | 2 +
...ltilevelB-SplineInterpolationforCategories.txt} | 7 +-
.../algs/saga/description/2.2.0/Resampling.txt | 7 +-
.../description/2.2.0/ThinPlateSpline(TIN).txt | 1 +
.../ThinPlateSpline.txt} | 6 +-
.../2.2.2/ConfusionMatrix(GridPolygons).txt | 12 +
.../description/2.2.2/DiversityOfCategories.txt | 14 +
.../algs/saga/description/2.2.2/GridMasking.txt | 1 +
.../2.2.2/GridStatisticsforPolygons.txt | 18 +-
.../2.2.2/MultilevelB-SplineInterpolation.txt | 1 -
...ltilevelB-SplineInterpolationforCategories.txt} | 7 +-
.../algs/saga/description/2.2.2/Resampling.txt | 7 +-
.../description/2.2.2/ResidualAnalysis(Grid).txt | 9 +-
.../ThinPlateSpline.txt} | 6 +-
.../2.2.3/ConfusionMatrix(GridPolygons).txt | 12 +
.../saga/description/2.2.3/CreateGraticule.txt | 8 -
.../description/2.2.3/CreateLinesGraticule.txt | 9 +
.../description/2.2.3/CreatePolygonsGraticule.txt | 9 +
.../2.2.3/DiffusiveHillslopeEvolution(ADI).txt | 11 +
.../2.2.3/DiffusiveHillslopeEvolution(FTCS).txt | 11 +
.../description/2.2.3/DiversityOfCategories.txt | 15 +
.../saga/description/2.2.3/FillSinks(QMofESP).txt | 6 +
.../2.2.3/FlowAccumulation(QMofESP).txt | 6 +
.../algs/saga/description/2.2.3/GridMasking.txt | 1 +
.../2.2.3/GridStatisticsforPolygons.txt | 20 +-
.../algs/saga/description/2.2.3/Mosaicking.txt | 1 +
.../2.2.3/MultilevelB-SplineInterpolation.txt | 1 -
...ltilevelB-SplineInterpolationforCategories.txt} | 7 +-
.../algs/saga/description/2.2.3/Resampling.txt | 7 +-
.../description/2.2.3/ResidualAnalysis(Grid).txt | 10 +-
.../description/2.2.3/SuccessiveFlowRouting.txt | 7 +
...nPlateSpline(Local).txt => ThinPlateSpline.txt} | 6 +-
python/plugins/processing/gui/BatchPanel.py | 55 +-
python/plugins/processing/gui/ProcessingToolbox.py | 4 +-
.../plugins/processing/modeler/ModelerAlgorithm.py | 4 +-
python/plugins/processing/tools/raster.py | 10 +-
.../qgsplugininstallerinstallingdialog.py | 30 +-
scripts/release.pl | 11 +-
src/analysis/vector/qgstransectsample.cpp | 6 +-
src/analysis/vector/qgszonalstatistics.h | 2 +-
src/app/CMakeLists.txt | 36 +-
src/app/composer/qgscomposerpicturewidget.cpp | 139 +-
src/app/composer/qgscomposerpicturewidget.h | 9 +
src/app/gps/qwtpolar-1.1.1/qwt_polar.h | 84 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_canvas.cpp | 320 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_canvas.h | 79 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_curve.cpp | 596 ++
src/app/gps/qwtpolar-1.1.1/qwt_polar_curve.h | 161 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_fitter.cpp | 100 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_fitter.h | 40 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_global.h | 39 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_grid.cpp | 1138 ++
src/app/gps/qwtpolar-1.1.1/qwt_polar_grid.h | 187 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_item.cpp | 484 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_item.h | 178 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_itemdict.cpp | 171 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_itemdict.h | 55 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_layout.cpp | 444 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_layout.h | 78 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_magnifier.cpp | 167 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_magnifier.h | 58 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_marker.cpp | 233 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_marker.h | 70 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_panner.cpp | 118 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_panner.h | 52 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_picker.cpp | 246 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_picker.h | 98 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.cpp | 1362 +++
src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.h | 219 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_renderer.cpp | 437 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_renderer.h | 72 +
.../gps/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp | 495 +
src/app/gps/qwtpolar-1.1.1/qwt_polar_spectrogram.h | 92 +
src/app/main.cpp | 13 +-
src/app/qgisapp.cpp | 122 +-
src/app/qgsconfigureshortcutsdialog.cpp | 3 +-
src/app/qgsdiagramproperties.cpp | 2 +-
src/app/qgslabelinggui.cpp | 1 +
src/app/qgspluginregistry.cpp | 4 +
src/core/CMakeLists.txt | 2 +
src/core/composer/qgscomposermapgrid.cpp | 3 +
src/core/composer/qgscomposerpicture.cpp | 145 +-
src/core/composer/qgscomposerpicture.h | 56 +
src/core/geometry/qgsgeometrycollectionv2.cpp | 4 +
src/core/geometry/qgsgeometryfactory.cpp | 1 +
src/core/geometry/qgsgeos.cpp | 2 +-
src/core/qgscoordinatereferencesystem.cpp | 6 +-
src/core/qgsexpression.cpp | 17 +-
src/core/qgsexpressionlexer.ll | 3 +
src/core/qgshttptransaction.cpp | 4 +-
src/core/qgsmaprenderer.cpp | 1 +
src/core/qgsmaprenderercustompainterjob.cpp | 2 +
src/core/qgsmaprendererparalleljob.cpp | 4 +
src/core/qgsmaptopixelgeometrysimplifier.cpp | 1 +
src/core/qgsnetworkaccessmanager.cpp | 74 +-
src/core/qgsnetworkaccessmanager.h | 22 +-
src/core/qgsnetworkdiskcache.cpp | 115 +
src/core/qgsnetworkdiskcache.h | 100 +
src/core/qgspointlocator.cpp | 3 +
src/core/qgsslconnect.cpp | 11 +
src/core/qgssqlexpressioncompiler.cpp | 21 +
src/core/qgssqlexpressioncompiler.h | 3 +
src/core/qgsvectorfilewriter.cpp | 9 +-
.../symbology-ng/qgssinglesymbolrendererv2.cpp | 6 +
src/core/symbology-ng/qgssinglesymbolrendererv2.h | 2 +
src/core/symbology-ng/qgsstylev2.cpp | 89 +-
src/core/symbology-ng/qgsstylev2.h | 6 +
src/gui/attributetable/qgsdualview.cpp | 10 +-
src/gui/layertree/qgslayertreemapcanvasbridge.cpp | 6 +-
src/gui/qgscredentialdialog.cpp | 1 +
src/gui/qgsmapcanvas.cpp | 1 +
src/gui/qgsrasterlayersaveasdialog.cpp | 4 +-
src/plugins/evis/evis.cpp | 4 +-
src/plugins/geometry_checker/utils/qgsgeomutils.h | 23 +-
src/plugins/globe/CMakeLists.txt | 2 +
src/plugins/globe/globe_plugin.cpp | 36 +-
src/providers/grass/qgsgrass.cpp | 16 +-
src/providers/memory/qgsmemoryprovider.cpp | 12 +-
src/providers/mssql/qgsmssqlfeatureiterator.cpp | 2 +-
src/providers/ogr/qgsogrexpressioncompiler.cpp | 9 +-
src/providers/ogr/qgsogrprovider.cpp | 16 +-
.../spatialite/qgsspatialitefeatureiterator.cpp | 10 +-
src/providers/spatialite/qgsspatialiteprovider.cpp | 64 +-
src/providers/spatialite/qgsspatialiteprovider.h | 3 +
src/providers/virtual/CMakeLists.txt | 1 +
src/providers/virtual/qgsvirtuallayerprovider.cpp | 2 +-
src/providers/wcs/qgswcscapabilities.cpp | 37 +-
src/providers/wcs/qgswcscapabilities.h | 3 +-
src/providers/wcs/qgswcsprovider.cpp | 30 +-
src/providers/wcs/qgswcsprovider.h | 3 -
src/providers/wfs/qgswfsdataitems.cpp | 17 +-
src/providers/wfs/qgswfsdataitems.h | 3 -
src/providers/wms/qgswmscapabilities.cpp | 55 +-
src/providers/wms/qgswmscapabilities.h | 18 +-
src/providers/wms/qgswmsprovider.cpp | 44 +-
src/providers/wms/qgswmsprovider.h | 2 -
src/server/qgsserverprojectparser.cpp | 15 +-
src/server/qgswfsprojectparser.cpp | 2 +
src/ui/composer/qgscomposerpicturewidgetbase.ui | 145 +-
src/ui/qgsabout.ui | 10 +
src/ui/qgsdiagrampropertiesbase.ui | 18 +-
src/ui/qgsrulebasedrendererv2widget.ui | 13 +-
tests/src/core/testqgscomposerpicture.cpp | 23 +
tests/src/core/testqgsexpression.cpp | 55 +
tests/src/core/testqgsgeometry.cpp | 4 +
tests/src/core/testqgsstylev2.cpp | 110 +
tests/src/providers/testqgswcspublicservers.cpp | 2 +-
tests/src/python/providertestbase.py | 11 +
tests/src/python/test_provider_memory.py | 1 +
tests/src/python/test_provider_spatialite.py | 11 +
tests/src/python/test_qgsgeometry.py | 15 +
tests/src/python/test_qgsserver.py | 13 +-
.../expected_atlas_autoscale1_mask.png | Bin 30630 -> 30674 bytes
.../expected_atlas_autoscale2_mask.png | Bin 34016 -> 34030 bytes
.../expected_atlas_autoscale_old_api1_mask.png | Bin 30630 -> 30674 bytes
.../expected_atlas_autoscale_old_api2_mask.png | Bin 34016 -> 34030 bytes
.../expected_atlas_filtering1_mask.png | Bin 34115 -> 34163 bytes
.../expected_atlas_fixedscale1_mask.png | Bin 32163 -> 32217 bytes
.../expected_atlas_fixedscale2_mask.png | Bin 33062 -> 33076 bytes
.../expected_atlas_fixedscale_old_api1_mask.png | Bin 32163 -> 32217 bytes
.../expected_atlas_fixedscale_old_api2_mask.png | Bin 33062 -> 33076 bytes
.../expected_atlas_hiding1_mask.png | Bin 12393 -> 12444 bytes
.../expected_atlas_hiding2_mask.png | Bin 10487 -> 10502 bytes
.../expected_atlas_predefinedscales1_mask.png | Bin 30681 -> 30744 bytes
.../expected_atlas_predefinedscales2_mask.png | Bin 29807 -> 29801 bytes
.../expected_atlas_sorting1_mask.png | Bin 34298 -> 34335 bytes
.../expected_atlas_sorting2_mask.png | Bin 27506 -> 27590 bytes
.../expected_atlas_two_maps1_mask.png | Bin 31062 -> 31122 bytes
.../expected_atlas_two_maps2_mask.png | Bin 32786 -> 32798 bytes
.../expected_composerrotation_label_mask.png | Bin 9094 -> 9065 bytes
.../expected_composerrotation_maprotation_mask.png | Bin 0 -> 5421 bytes
...ed_composermap_exteriorticks_annotated_mask.png | Bin 33697 -> 33593 bytes
...d_composermap_exteriorticks_annotated2_mask.png | Bin 29602 -> 29556 bytes
...pected_composermap_filteredannotations_mask.png | Bin 20483 -> 30583 bytes
...sermap_interiorexteriorticks_annotated_mask.png | Bin 31381 -> 31393 bytes
...ermap_interiorexteriorticks_annotated2_mask.png | Bin 29602 -> 29556 bytes
...ed_composermap_interiorticks_annotated_mask.png | Bin 31381 -> 31393 bytes
...d_composermap_interiorticks_annotated2_mask.png | Bin 32536 -> 32468 bytes
...ected_composermap_lineborder_annotated_mask.png | Bin 32472 -> 32305 bytes
...cted_composermap_lineborder_annotated2_mask.png | Bin 32403 -> 32326 bytes
...xpected_composermap_rotatedannotations_mask.png | Bin 39132 -> 49060 bytes
..._composermap_verticaldescending_inside_mask.png | Bin 40872 -> 40991 bytes
...composermap_verticaldescending_outside_mask.png | Bin 43103 -> 43108 bytes
.../expected_composerpicture_svg_params.png | Bin 0 -> 34554 bytes
.../expected_composerscalebar_doublebox_mask.png | Bin 8947 -> 8918 bytes
.../expected_composerscalebar_numeric_mask.png | Bin 7720 -> 7739 bytes
.../expected_composerscalebar_singlebox_mask.png | Bin 8856 -> 8826 bytes
.../expected_composerscalebar_tick_mask.png | Bin 8887 -> 8859 bytes
.../expected_composerattributetable_align_mask.png | Bin 42737 -> 42975 bytes
...pected_composerattributetable_autowrap_mask.png | Bin 50549 -> 50560 bytes
...ected_composerattributetable_cellstyle_mask.png | Bin 29157 -> 29104 bytes
...ted_composerattributetable_columnwidth_mask.png | Bin 36444 -> 36344 bytes
...ected_composerattributetable_drawempty_mask.png | Bin 29057 -> 29005 bytes
...ted_composerattributetable_headersonly_mask.png | Bin 17415 -> 17366 bytes
...ected_composerattributetable_multiline_mask.png | Bin 42356 -> 42256 bytes
...expected_composerattributetable_render_mask.png | Bin 42220 -> 42124 bytes
...ted_composerattributetable_showmessage_mask.png | Bin 20888 -> 20832 bytes
.../expected_legend_basic_mask.png | Bin 19209 -> 19044 bytes
.../expected_legend_big_marker_mask.png | Bin 20733 -> 20496 bytes
.../expected_legend_filter_by_expression_mask.png | Bin 12137 -> 12134 bytes
.../expected_legend_filter_by_map_mask.png | Bin 13779 -> 13766 bytes
.../expected_legend_filter_by_map_dupe_mask.png | Bin 2296 -> 2873 bytes
.../expected_legend_filter_by_polygon_mask.png | Bin 12137 -> 12134 bytes
.../expected_legend_long_symbol_text_mask.png | Bin 23719 -> 23507 bytes
.../expected_legend_raster_border_mask.png | Bin 1015 -> 1014 bytes
.../expected_legend_three_columns_mask.png | Bin 19244 -> 19184 bytes
tests/testdata/provider/testdata_mssql.sql | 13 +-
tests/testdata/qgis_server/getprojectsettings.txt | 2 +-
.../qgis_server/wfs_describefeaturetype.txt | 2 +-
tests/testdata/svg_params.svg | 43 +
248 files changed, 15849 insertions(+), 5899 deletions(-)
diff --cc debian/changelog
index bb5c83b,40e473c..8aa02bb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,72 -1,21 +1,76 @@@
- qgis (2.14.0+dfsg0-4) UNRELEASED; urgency=medium
-qgis (2.14.1) UNRELEASED; urgency=medium
++qgis (2.14.1+dfsg-1) UNRELEASED; urgency=medium
++ [ Jürgen E. Fischer ]
+ * Release of 2.14.1
+
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 25 Mar 2016 13:17:00 +0100
++ [ Bas Couwenberg ]
+ * 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.
- -- Bas Couwenberg <sebastic at debian.org> Fri, 25 Mar 2016 14:24:17 +0100
-qgis (2.14.0) unstable; urgency=medium
++ -- Bas Couwenberg <sebastic at debian.org> Fri, 25 Mar 2016 14:41:00 +0100
- [ Jürgen E. Fischer ]
- * Release of 2.14.0
+qgis (2.14.0+dfsg0-3) unstable; urgency=medium
- [ Bas Couwenberg ]
- * Fix removal of obsolete diversions for bother the grass plugin & provider.
+ * 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.13.0) unstable; urgency=medium
+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