This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit 1e5dbee71f04e48fdb26aa197012fe6bb75868df Merge: 82a4b02 b3f56c4 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Thu Jul 30 01:31:14 2015 +0200 Merge tag 'upstream/2.8.3+dfsg' Upstream version 2.8.3+dfsg Conflicts: debian/changelog CMakeLists.txt | 12 +- ChangeLog | 951 +++ cmake/FindSPATIALITE.cmake | 1 + debian/changelog | 6 + doc/CONTRIBUTORS | 1 + doc/TRANSLATORS | 88 +- doc/contributors.json | 6 +- doc/developersmap.html | 11 +- i18n/qgis_de.ts | 8738 +++++++++++--------- i18n/qgis_en.ts | 397 +- i18n/qgis_ja.ts | 996 ++- images/svg/shopping/shopping_alcohol.svg | 4 - images/svg/shopping/shopping_fish.svg | 4 - mac/app.info.plist.in | 2 +- mac/browser.info.plist.in | 2 +- python/core/composer/qgscomposermap.sip | 16 +- python/core/dxf/qgsdxfexport.sip | 20 +- .../core/layertree/qgslayertreemodellegendnode.sip | 2 +- python/core/qgsfeature.sip | 8 +- python/core/qgspallabeling.sip | 9 + python/core/qgsvectorlayer.sip | 2 +- python/core/raster/qgsrasterblock.sip | 17 + python/core/symbology-ng/qgsfillsymbollayerv2.sip | 2 + python/core/symbology-ng/qgslinesymbollayerv2.sip | 2 + .../core/symbology-ng/qgsmarkersymbollayerv2.sip | 1 + python/core/symbology-ng/qgssvgcache.sip | 4 + python/ext-libs/pyspatialite/src/connection.c | 16 +- python/ext-libs/pyspatialite/src/connection.h | 3 +- .../db_manager/db_plugins/postgis/plugin.py | 4 +- .../postgis/plugins/qgis_topoview/__init__.py | 16 +- python/plugins/db_manager/dlg_sql_window.py | 24 +- .../processing/algs/grass7/Grass7Algorithm.py | 10 +- python/plugins/processing/algs/qgis/ConvexHull.py | 13 +- .../processing/algs/qgis/SelectByAttribute.py | 7 +- .../processing/algs/qgis/VectorLayerScatterplot.py | 4 +- .../algs/qgis/scripts/Create_points_along_lines.py | 2 +- .../scripts/Number_of_unique_values_in_classes.py | 4 + .../algs/qgis/ui/FieldsCalculatorDialog.py | 3 +- python/plugins/processing/algs/saga/CMakeLists.txt | 2 +- python/plugins/processing/algs/saga/SagaUtils.py | 5 +- .../processing/script/AddScriptFromFileAction.py | 7 +- python/user.py | 14 +- resources/function_help/NULL | 14 + scripts/update_ts.sh | 2 +- src/analysis/network/CMakeLists.txt | 4 + src/analysis/openstreetmap/qgsosmdatabase.cpp | 13 +- src/analysis/openstreetmap/qgsosmimport.cpp | 10 +- src/analysis/vector/qgszonalstatistics.cpp | 31 +- src/analysis/vector/qgszonalstatistics.h | 4 + src/app/composer/qgscomposer.cpp | 78 +- src/app/composer/qgscomposer.h | 12 +- src/app/gps/qgsgpsinformationwidget.cpp | 5 +- src/app/nodetool/qgsmaptoolnodetool.cpp | 87 +- src/app/qgisapp.cpp | 69 +- src/app/qgsadvanceddigitizingdockwidget.cpp | 77 +- src/app/qgsadvanceddigitizingdockwidget.h | 1 - src/app/qgsapplayertreeviewmenuprovider.cpp | 34 +- src/app/qgsbookmarks.cpp | 6 +- src/app/qgsdxfexportdialog.cpp | 15 +- src/app/qgsloadstylefromdbdialog.cpp | 35 +- src/app/qgsloadstylefromdbdialog.h | 1 - src/app/qgsnewspatialitelayerdialog.cpp | 24 +- src/app/qgsoptions.cpp | 4 +- src/app/qgsprojectlayergroupdialog.cpp | 5 + src/app/qgsprojectlayergroupdialog.h | 2 + src/app/qgstipgui.cpp | 2 +- src/browser/main.cpp | 35 +- src/core/CMakeLists.txt | 3 + src/core/composer/qgscomposermap.cpp | 13 +- src/core/composer/qgscomposermap.h | 15 +- src/core/composer/qgscomposermapgrid.cpp | 12 + src/core/dxf/qgsdxfexport.cpp | 181 +- src/core/dxf/qgsdxfexport.h | 17 +- src/core/dxf/qgsdxfpaintengine.cpp | 106 +- src/core/dxf/qgsdxfpaintengine.h | 5 +- src/core/dxf/qgsdxfpallabeling.cpp | 3 +- src/core/gps/qgsgpsdetector.cpp | 8 +- src/core/layertree/qgslayertreemodellegendnode.cpp | 7 +- src/core/layertree/qgslayertreemodellegendnode.h | 3 +- src/core/qgis.h | 5 +- src/core/qgscolorscheme.h | 6 +- src/core/qgscoordinatereferencesystem.cpp | 15 +- src/core/qgsdataitem.cpp | 6 +- src/core/qgsdataitem.h | 3 +- src/core/qgsdistancearea.cpp | 3 +- src/core/qgsexpression.cpp | 15 +- src/core/qgsfeature.h | 45 +- src/core/qgsfield.cpp | 6 +- src/core/qgsgeometry.h | 2 +- src/core/qgsgeometryvalidator.cpp | 4 +- src/core/qgsgml.cpp | 1 + src/core/qgslayerdefinition.cpp | 2 +- src/core/qgslocalec.cpp | 43 + .../qgspostgresconnpool.cpp => core/qgslocalec.h} | 40 +- src/core/qgsmaplayer.cpp | 144 +- src/core/qgsofflineediting.cpp | 13 +- src/core/qgspalgeometry.h | 51 +- src/core/qgspallabeling.cpp | 48 +- src/core/qgspallabeling.h | 9 + src/core/qgspoint.cpp | 20 +- src/core/qgspointlocator.cpp | 41 +- src/core/qgsproject.cpp | 2 +- src/core/qgsrectangle.cpp | 3 + src/core/qgsrenderchecker.cpp | 22 +- src/core/qgsslconnect.cpp | 89 + src/core/qgsslconnect.h | 39 + src/core/qgsvectorfilewriter.cpp | 38 +- src/core/qgsvectorlayer.cpp | 45 +- src/core/qgsvectorlayer.h | 2 +- src/core/qgsvectorlayereditbuffer.cpp | 12 +- src/core/qgsvectorlayerfeatureiterator.cpp | 5 +- src/core/qgsvectorlayerjoinbuffer.cpp | 3 +- src/core/raster/qgsrasterblock.cpp | 27 + src/core/raster/qgsrasterblock.h | 17 + src/core/raster/qgsrasterlayer.cpp | 14 +- src/core/raster/qgsrasterprojector.cpp | 1 + src/core/raster/qgssinglebandcolordatarenderer.cpp | 12 +- src/core/symbology-ng/qgsellipsesymbollayerv2.cpp | 74 +- src/core/symbology-ng/qgsfillsymbollayerv2.cpp | 8 + src/core/symbology-ng/qgsfillsymbollayerv2.h | 2 + src/core/symbology-ng/qgslinesymbollayerv2.cpp | 8 + src/core/symbology-ng/qgslinesymbollayerv2.h | 2 + src/core/symbology-ng/qgsmarkersymbollayerv2.cpp | 228 +- src/core/symbology-ng/qgsmarkersymbollayerv2.h | 3 +- .../symbology-ng/qgspointdisplacementrenderer.cpp | 19 +- .../symbology-ng/qgspointdisplacementrenderer.h | 2 +- src/core/symbology-ng/qgssvgcache.cpp | 50 +- src/core/symbology-ng/qgssvgcache.h | 4 + .../qgsattributetablefiltermodel.cpp | 4 +- src/gui/attributetable/qgsattributetableview.cpp | 23 - src/gui/attributetable/qgsdualview.cpp | 1 + src/gui/editorwidgets/qgsdatetimeedit.cpp | 1 + src/gui/editorwidgets/qgsrangeconfigdlg.cpp | 24 +- src/gui/editorwidgets/qgsrangewidgetfactory.cpp | 12 +- src/gui/editorwidgets/qgsrangewidgetwrapper.cpp | 67 +- src/gui/editorwidgets/qgsrangewidgetwrapper.h | 5 + src/gui/editorwidgets/qgstexteditwrapper.cpp | 22 +- src/gui/layertree/qgslayertreemapcanvasbridge.cpp | 25 +- src/gui/qgsattributeform.cpp | 19 +- src/gui/qgsattributeform.h | 5 + src/gui/qgsattributeformlegacyinterface.cpp | 3 +- src/gui/qgscomposerruler.cpp | 4 +- src/gui/qgsdatumtransformdialog.cpp | 3 + src/gui/qgsdial.cpp | 119 +- src/gui/qgsdial.h | 41 +- src/gui/qgsexpressionbuilderwidget.cpp | 26 +- src/gui/qgsexpressionbuilderwidget.h | 8 + src/gui/qgsmapcanvas.cpp | 6 + src/gui/qgsmapcanvassnapper.cpp | 14 +- src/gui/qgsmaptoolzoom.cpp | 6 +- src/gui/qgsnewhttpconnection.cpp | 3 +- src/gui/qgsrasterlayersaveasdialog.cpp | 5 + src/gui/qgsslider.cpp | 119 +- src/gui/qgsslider.h | 41 +- src/gui/qgssublayersdialog.cpp | 14 +- src/gui/symbology-ng/characterwidget.cpp | 6 + src/gui/symbology-ng/characterwidget.h | 1 + src/gui/symbology-ng/qgssymbollayerv2widget.cpp | 8 +- .../qgsvectorfieldsymbollayerwidget.cpp | 16 +- .../symbology-ng/qgsvectorfieldsymbollayerwidget.h | 2 +- src/plugins/grass/qgsgrassnewmapset.cpp | 11 +- src/plugins/grass/qgsgrassplugin.cpp | 8 +- src/plugins/spatialquery/qgsspatialquerydialog.cpp | 6 +- src/providers/gdal/qgsgdaldataitems.cpp | 21 +- src/providers/grass/qgsgrass.cpp | 43 +- src/providers/mssql/qgsmssqlgeometryparser.cpp | 4 +- src/providers/mssql/qgsmssqlnewconnection.cpp | 16 +- src/providers/mssql/qgsmssqlprovider.cpp | 48 +- src/providers/mssql/qgsmssqlsourceselect.cpp | 27 +- src/providers/ogr/qgsogrdataitems.cpp | 116 +- src/providers/ogr/qgsogrprovider.cpp | 55 +- src/providers/ogr/qgsogrprovider.h | 6 +- src/providers/oracle/qgsoraclefeatureiterator.cpp | 2 +- src/providers/oracle/qgsoraclenewconnection.cpp | 7 +- src/providers/oracle/qgsoracleprovider.cpp | 47 +- src/providers/ows/qgsowsdataitems.cpp | 2 +- src/providers/postgres/qgspgnewconnection.cpp | 4 +- src/providers/postgres/qgspgtablemodel.cpp | 15 +- src/providers/postgres/qgspostgresconnpool.cpp | 3 +- src/providers/postgres/qgspostgresconnpool.h | 3 +- src/providers/postgres/qgspostgresdataitems.cpp | 16 +- src/providers/postgres/qgspostgresprovider.cpp | 20 +- src/providers/spatialite/CMakeLists.txt | 8 - .../spatialite/qgsspatialiteconnection.cpp | 16 +- src/providers/spatialite/qgsspatialiteconnection.h | 2 - src/providers/spatialite/qgsspatialiteconnpool.cpp | 2 +- src/providers/spatialite/qgsspatialiteconnpool.h | 3 +- .../spatialite/qgsspatialitedataitems.cpp | 16 +- .../spatialite/qgsspatialitefeatureiterator.cpp | 12 +- src/providers/spatialite/qgsspatialiteprovider.cpp | 58 +- .../spatialite/qspatialite/CMakeLists.txt | 1 + .../spatialite/qspatialite/qsql_spatialite.cpp | 8 +- src/providers/wcs/qgswcsprovider.cpp | 6 + src/providers/wcs/qgswcsprovider.h | 2 + src/providers/wms/qgswmscapabilities.cpp | 14 + src/providers/wms/qgswmscapabilities.h | 7 +- src/providers/wms/qgswmsdataitems.cpp | 38 +- src/providers/wms/qgswmsprovider.cpp | 31 +- src/providers/wms/qgswmsprovider.h | 26 +- src/providers/wms/qgswmssourceselect.cpp | 2 + src/server/qgsconfigcache.cpp | 5 +- src/server/qgshttprequesthandler.cpp | 2 +- src/server/qgsserverprojectparser.cpp | 2 +- src/server/qgsserverprojectparser.h | 2 +- src/server/qgswfsserver.cpp | 2 +- src/server/qgswmsprojectparser.cpp | 41 +- src/server/qgswmsserver.cpp | 5 + src/ui/symbollayer/widget_vectorfield.ui | 22 +- tests/src/core/CMakeLists.txt | 2 + tests/src/core/testqgsexpression.cpp | 7 + tests/src/core/testqgsfields.cpp | 404 + tests/src/core/testqgspallabeling.cpp | 67 + tests/src/core/testqgspoint.cpp | 36 +- tests/src/python/test_qgsfeature.py | 11 +- 214 files changed, 9623 insertions(+), 6002 deletions(-) diff --cc debian/changelog index fec8df8,37ab519..f927065 --- a/debian/changelog +++ b/debian/changelog @@@ -1,142 -1,28 +1,148 @@@ + qgis (2.8.3) UNRELEASED; urgency=medium + + * Release of 2.8.3 + + -- Jürgen E. Fischer <j...@norbit.de> Tue, 28 Jul 2015 14:00:12 +0200 + -qgis (2.8.2) unstable; urgency=medium +qgis (2.8.2+dfsg-3) unstable; urgency=medium + * Update symbols for other architectures. + * Move from experimental to unstable. + + -- Bas Couwenberg <sebas...@debian.org> Mon, 27 Jul 2015 13:01:23 +0200 + +qgis (2.8.2+dfsg-3~exp1) experimental; urgency=medium + + * Limit upstream version to 2.8 LTR releases in watch file. + * Disable QwtPolar, embedded copies don't support Qwt > 6.0. + * Include change from 2.8.3 to fix segfauls caused by the deprecated + spatialite_init() method. (closes: #788101, #791680) + * Update symbols for amd64. + + -- Bas Couwenberg <sebas...@debian.org> Sun, 26 Jul 2015 16:31:54 +0200 + +qgis (2.8.2+dfsg-2) unstable; urgency=medium + + * Move from experimental to unstable. + + -- Bas Couwenberg <sebas...@debian.org> Fri, 26 Jun 2015 20:35:17 +0200 + +qgis (2.8.2+dfsg-1) experimental; urgency=medium + + * Update symbols for other architectures. + * Move from experimental to unstable. + + -- Bas Couwenberg <sebas...@debian.org> Fri, 26 Jun 2015 17:13:17 +0200 + +qgis (2.8.2+dfsg-1~exp2) experimental; urgency=medium + + * Add debug package for QGIS libraries. + (closes: #786985) + * Update allows-to-typo.patch to also fix 'Allow' variant. + + -- Bas Couwenberg <sebas...@debian.org> Wed, 27 May 2015 23:22:47 +0200 + +qgis (2.8.2+dfsg-1~exp1) experimental; urgency=medium + + [ Jürgen E. Fischer ] * Release of 2.8.2 - -- Jürgen E. Fischer <j...@norbit.de> Tue, 28 Jul 2015 14:00:12 +0200 + [ Bas Couwenberg ] + * New upstream release. + * Drop patches included upstream, refresh remaining patches. + * Update copyright years for Alexander Bruy. + * Update symbols for amd64. + + -- Bas Couwenberg <sebas...@debian.org> Sun, 10 May 2015 11:42:23 +0200 + +qgis (2.8.1+dfsg1-1) unstable; urgency=medium + + * Add patches from upstream release-2_8 branch. + * Move from experimental to unstable. -qgis (2.8.1) unstable; urgency=medium + -- Bas Couwenberg <sebas...@debian.org> Mon, 27 Apr 2015 15:43:48 +0200 +qgis (2.8.1+dfsg1-1~exp3) experimental; urgency=medium + + * Update symbols for armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, + mips, mipsel, powerpc, ppc64el & s390x. + * Add patches from upstream release-2_8 branch. + + -- Bas Couwenberg <sebas...@debian.org> Wed, 11 Mar 2015 18:52:57 +0100 + +qgis (2.8.1+dfsg1-1~exp2) experimental; urgency=medium + + * Don't build internal PySpatiaLite, use Debian package instead. + (closes: #779933) + * Add patch to fix FTBFS on arm*. + * Add patches from upstream release-2_8 branch. + + -- Bas Couwenberg <sebas...@debian.org> Mon, 09 Mar 2015 19:19:27 +0100 + +qgis (2.8.1+dfsg1-1~exp1) experimental; urgency=medium + + * Fix upstream version extraction from changelog. + * Move python-qgis from Recommends to Depends. + * Also exclude ElvenSword gradient from repacked upstream tarball, + has problematic license terms restricting use. + + -- Bas Couwenberg <sebas...@debian.org> Tue, 03 Mar 2015 08:09:28 +0100 + +qgis (2.8.1+dfsg-1~exp1) experimental; urgency=medium + + * Update copyright file, changes: + - Document copyright & license for src/core/pal/costcalculator* separately. + * Exclude dxf2shp plugin from repacked upstream tarball, see the copyright + file for details of the license issue. + + -- Bas Couwenberg <sebas...@debian.org> Sat, 28 Feb 2015 20:47:41 +0100 + +qgis (2.8.1-1~exp1) experimental; urgency=medium + + [ Jürgen E. Fischer ] * Release of 2.8.1 - -- Jürgen E. Fischer <j...@norbit.de> Sat, 09 May 2015 22:02:02 +0200 + [ Bas Couwenberg ] + * New upstream release. + * Update grass dependencies to prevent building with unsupported GRASS 7. + * Refresh patches. + * Add patches from release-2_8 branch. + * Update symbols for amd64. -qgis (2.8.0) unstable; urgency=medium + -- Bas Couwenberg <sebas...@debian.org> Fri, 27 Feb 2015 08:39:40 +0100 - * Release of 2.8 +qgis (2.8.0-1~exp1) experimental; urgency=medium - -- Jürgen E. Fischer <j...@norbit.de> Thu, 26 Feb 2015 10:12:00 +0100 + [ Jürgen E. Fischer ] + * Release of 2.8 -qgis (2.7.0) unstable; urgency=medium + [ Bas Couwenberg ] + * Update Vcs-Browser URL to use cgit instead of gitweb. + * Update my email to use @debian.org address. + * Drop patches included upstream, refresh remaining patches. + * Update copyright file, changes: + - Add additional copyright holders to general files section + - Add copyright years to general files section + - Order copyright holder by year + - Group files sections + - Sort groups files sections alphanumerically + - Document copyright holders & licenses for external modules + - Add license specifications for: Apache-2.0, BSD-2-Clause, + dxflib-Commercial-License, GPL-2, LGPL-2.1+, QT-Commericial, + LGPL-2.1 with Digia Qt LGPL Exception 1.1 & GPL-3. + * Remove extra license file for MetaSearch plugin. + * Add symbols file for libqgis-server2.8.0. + * Update symbols for amd64. + * Drop obsolete WITH_INTERNAL_SPATIALITE option. + * Install libqgis_server.so in libqgis-dev. + * Install schemaExtension.xsd in qgis-server. + * Install contributors.json & developersmap.html in qgis-common. + * Use Debian packages for Leaflet & jQuery in developersmap.html. + * Add dependency on libqgis-server to libqgis-dev. + + -- Bas Couwenberg <sebas...@debian.org> Wed, 25 Feb 2015 18:54:10 +0100 + +qgis (2.7.0) UNRELEASED; urgency=medium * New development version 2.7 after branch of 2.6 * run tests in en_US.UTF-8 locale -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel