This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit 6414d5069ea29a547746ab65e5d16f328d681b47 Merge: 067e9c1 0ca3574 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun May 10 10:44:00 2015 +0200 Merge tag 'upstream/2.8.2+dfsg' Upstream version 2.8.2+dfsg Conflicts: debian/changelog debian/qgis-common.links CMakeLists.txt | 4 +- ChangeLog | 662 +++++++++++ cmake/MacBundleMacros.cmake | 6 +- cmake_templates/Doxyfile.in | 1 + debian/changelog | 6 + doc/TRANSLATORS | 89 +- i18n/CMakeLists.txt | 2 +- i18n/qgis_de.ts | 1163 +++++++++++++++++++- i18n/qgis_en.ts | 931 +++++++++++++++- mac/cmake/0qgis.cmake.in | 5 + ms-windows/osgeo4w/package-nightly.cmd | 5 +- ms-windows/osgeo4w/postinstall-dev.bat | 12 +- ms-windows/osgeo4w/preremove-dev.bat | 11 + python/core/core.sip | 1 + python/core/qgslayerdefinition.sip | 16 +- .../editorwidgets/core/qgseditorwidgetfactory.sip | 2 +- python/gui/qgsmapcanvas.sip | 3 + python/plugins/MetaSearch/dialogs/maindialog.py | 14 +- python/plugins/db_manager/db_model.py | 2 +- .../db_manager/db_plugins/spatialite/plugin.py | 8 +- .../plugins/processing/algs/gdal/ClipByExtent.py | 2 +- python/plugins/processing/algs/gdal/ColorRelief.py | 2 +- python/plugins/processing/algs/gdal/GridAverage.py | 2 +- .../processing/algs/gdal/GridDataMetrics.py | 2 +- python/plugins/processing/algs/gdal/GridInvDist.py | 2 +- python/plugins/processing/algs/gdal/GridNearest.py | 2 +- .../plugins/processing/algs/gdal/OgrAlgorithm.py | 33 +- python/plugins/processing/algs/gdal/aspect.py | 2 +- python/plugins/processing/algs/gdal/buildvrt.py | 2 +- python/plugins/processing/algs/gdal/fillnodata.py | 2 +- python/plugins/processing/algs/gdal/gdal2xyz.py | 2 +- python/plugins/processing/algs/gdal/gdaladdo.py | 2 +- python/plugins/processing/algs/gdal/hillshade.py | 2 +- python/plugins/processing/algs/gdal/merge.py | 2 +- python/plugins/processing/algs/gdal/nearblack.py | 2 +- python/plugins/processing/algs/gdal/pct2rgb.py | 2 +- python/plugins/processing/algs/gdal/polygonize.py | 2 +- python/plugins/processing/algs/gdal/proximity.py | 2 +- python/plugins/processing/algs/gdal/rasterize.py | 40 +- python/plugins/processing/algs/gdal/rgb2pct.py | 2 +- python/plugins/processing/algs/gdal/roughness.py | 2 +- python/plugins/processing/algs/gdal/sieve.py | 2 +- python/plugins/processing/algs/gdal/slope.py | 2 +- python/plugins/processing/algs/gdal/tpi.py | 2 +- python/plugins/processing/algs/gdal/translate.py | 4 +- python/plugins/processing/algs/gdal/warp.py | 4 +- .../algs/grass/description/v.buffer.column.txt | 2 +- .../algs/grass/description/v.buffer.distance.txt | 2 +- .../algs/grass7/description/v.buffer.column.txt | 2 +- .../algs/grass7/description/v.buffer.distance.txt | 2 +- .../algs/grass7/description/v.generalize.txt | 3 +- python/plugins/processing/algs/otb/OTBUtils.py | 3 +- python/plugins/processing/algs/qgis/Grid.py | 10 +- .../processing/algs/qgis/HypsometricCurves.py | 6 + .../processing/algs/qgis/QGISAlgorithmProvider.py | 4 +- ...ricalDifference.py => SymmetricalDifference.py} | 4 +- .../processing/algs/qgis/VectorLayerScatterplot.py | 2 + .../description/2.1.3/AddCoordinatestopoints.txt | 2 +- .../2.1.3/CatchmentArea(FlowTracing).txt | 8 +- .../description/2.1.3/CatchmentArea(Parallel).txt | 4 +- .../description/2.1.3/CatchmentArea(Recursive).txt | 6 +- .../saga/description/2.1.3/ClipGridwithPolygon.txt | 2 +- .../description/2.1.3/ContourLinesfromGrid.txt | 2 +- .../algs/saga/description/2.1.3/CropToData.txt | 2 +- .../algs/saga/description/2.1.3/GridCalculator.txt | 2 +- .../description/2.1.3/InverseDistanceWeighted.txt | 10 +- .../description/2.1.3/KernelDensityEstimation.txt | 5 +- .../MultilevelB-SplineInterpolation(fromGrid).txt | 4 +- .../2.1.3/MultilevelB-SplineInterpolation.txt | 10 +- .../saga/description/2.1.3/NaturalNeighbour.txt | 2 +- .../saga/description/2.1.3/NearestNeighbour.txt | 2 +- .../description/2.1.3/OrdinaryKriging(Global).txt | 2 +- .../saga/description/2.1.3/OrdinaryKriging.txt | 2 +- .../description/2.1.3/PolynomialRegression.txt | 2 +- .../algs/saga/description/2.1.3/Resampling.txt | 2 +- .../2.1.3/Separatepointsbydirection.txt | 2 +- .../algs/saga/description/2.1.3/ShapestoGrid.txt | 14 +- .../description/2.1.3/Slope,Aspect,Curvature.txt | 6 +- .../saga/description/2.1.3/StatisticsforGrids.txt | 6 +- .../saga/description/2.1.3/TransformShapes.txt | 2 +- .../algs/saga/description/2.1.3/Triangulation.txt | 2 +- .../description/2.1.3/UniversalKriging(Global).txt | 2 +- .../saga/description/2.1.3/UniversalKriging.txt | 2 +- .../description/2.1.3/VectorisingGridClasses.txt | 6 +- .../plugins/processing/algs/taudem/CMakeLists.txt | 6 +- .../processing/algs/taudem/TauDEMAlgorithm.py | 7 +- .../algs/taudem/TauDEMAlgorithmProvider.py | 113 +- ...DEMAlgorithm.py => TauDEMMultifileAlgorithm.py} | 23 +- .../plugins/processing/algs/taudem/TauDEMUtils.py | 28 +- .../algs/taudem/description/multi/aread8.txt | 8 + .../algs/taudem/description/multi/areadinf.txt | 8 + .../algs/taudem/description/multi/d8flowdir.txt | 6 + .../{ => multi}/d8flowpathextremeup.txt | 8 +- .../taudem/description/multi/d8hdisttostrm.txt | 7 + .../taudem/description/multi/dinfavalanche.txt | 11 + .../taudem/description/multi/dinfconclimaccum.txt | 11 + .../taudem/description/multi/dinfdecayaccum.txt | 9 + .../algs/taudem/description/multi/dinfflowdir.txt | 6 + .../algs/taudem/description/multi/dinfrevaccum.txt | 7 + .../taudem/description/multi/dinfupdependence.txt | 6 + .../taudem/description/multi/gagewatershed.txt | 6 + .../taudem/description/multi/gagewatershed2.txt | 7 + .../description/{ => multi}/moveoutletstostrm.txt | 6 +- .../algs/taudem/description/multi/pitremove.txt | 5 + .../taudem/description/multi/selectgtthreshold.txt | 6 + .../taudem/description/multi/slopearearatio.txt | 6 + .../algs/taudem/description/multi/slopeavedown.txt | 7 + .../algs/taudem/description/multi/streamnet.txt | 14 + .../algs/taudem/description/multi/threshold.txt | 7 + .../algs/taudem/description/multi/twi.txt | 6 + .../taudem/description/{ => single}/aread8.txt | 0 .../taudem/description/{ => single}/areadinf.txt | 0 .../taudem/description/{ => single}/d8flowdir.txt | 0 .../{ => single}/d8flowpathextremeup.txt | 0 .../description/{ => single}/d8hdisttostrm.txt | 0 .../description/{ => single}/dinfavalanche.txt | 0 .../description/{ => single}/dinfconclimaccum.txt | 0 .../description/{ => single}/dinfdecayaccum.txt | 0 .../description/{ => single}/dinfflowdir.txt | 0 .../description/{ => single}/dinfrevaccum.txt | 0 .../description/{ => single}/dinfupdependence.txt | 0 .../taudem/description/single/gagewatershed.txt | 6 + .../taudem/description/single/gagewatershed2.txt | 7 + .../description/{ => single}/moveoutletstostrm.txt | 0 .../taudem/description/{ => single}/pitremove.txt | 0 .../description/single/selectgtthreshold.txt | 6 + .../description/{ => single}/slopearearatio.txt | 0 .../description/{ => single}/slopeavedown.txt | 0 .../taudem/description/{ => single}/streamnet.txt | 0 .../taudem/description/{ => single}/threshold.txt | 0 .../algs/taudem/description/single/twi.txt | 6 + .../plugins/processing/algs/taudem/dinfdistdown.py | 2 +- .../{dinfdistdown.py => dinfdistdown_multi.py} | 43 +- .../plugins/processing/algs/taudem/dinfdistup.py | 2 +- .../taudem/{dinfdistup.py => dinfdistup_multi.py} | 39 +- .../processing/algs/taudem/dinftranslimaccum.py | 2 +- .../processing/algs/taudem/dinftranslimaccum2.py | 2 +- ...anslimaccum2.py => dinftranslimaccum2_multi.py} | 44 +- ...translimaccum.py => dinftranslimaccum_multi.py} | 38 +- .../processing/algs/taudem/dropanalysis_multi.py | 124 +++ .../{dinftranslimaccum.py => gridnet_multi.py} | 96 +- .../processing/algs/taudem/lengtharea_multi.py | 96 ++ .../processing/algs/taudem/peukerdouglas_multi.py | 94 ++ .../processing/algs/taudem/slopearea_multi.py | 96 ++ python/plugins/processing/gui/BatchPanel.py | 2 +- .../processing/gui/MultipleFileInputDialog.py | 3 + .../processing/modeler/AddModelFromFileAction.py | 8 +- .../processing/script/AddScriptFromFileAction.py | 8 +- resources/customization.xml | 1 - scripts/tsstat.pl | 4 +- scripts/update_ts.sh | 2 +- src/analysis/raster/qgsrastermatrix.cpp | 2 +- .../composer/qgscomposerattributetablewidget.cpp | 2 +- src/app/main.cpp | 18 + src/app/qgisapp.cpp | 15 +- src/app/qgsattributetabledialog.cpp | 8 +- src/app/qgsdecorationgriddialog.cpp | 1 + src/app/qgsfieldcalculator.cpp | 6 +- src/app/qgslabelpropertydialog.cpp | 2 +- src/app/qgsrasterlayerproperties.cpp | 2 +- src/browser/CMakeLists.txt | 2 + src/browser/main.cpp | 28 + src/core/diagram/qgstextdiagram.cpp | 7 - src/core/dxf/qgsdxfexport.cpp | 89 +- src/core/dxf/qgsdxfpaintengine.cpp | 36 +- src/core/dxf/qgsdxfpaintengine.h | 1 - src/core/pal/feature.cpp | 10 +- src/core/qgsexpression.cpp | 8 +- src/core/qgsmimedatautils.cpp | 2 + src/core/qgspallabeling.cpp | 26 +- src/core/qgspointlocator.cpp | 29 +- src/core/qgsvectorlayer.cpp | 15 +- src/core/symbology-ng/qgsheatmaprenderer.cpp | 23 +- src/core/symbology-ng/qgsmarkersymbollayerv2.cpp | 2 +- .../editorwidgets/core/qgseditorwidgetfactory.h | 2 +- src/gui/qgsattributedialog.cpp | 1 + src/gui/qgsexpressionbuilderwidget.cpp | 2 +- src/gui/qgsmapcanvas.cpp | 11 + src/gui/qgsmapcanvas.h | 3 + src/gui/qgsrasterlayersaveasdialog.cpp | 8 +- src/gui/qgsrubberband.cpp | 25 +- src/gui/raster/qgsrasterhistogramwidget.cpp | 2 +- .../symbology-ng/qgsrulebasedrendererv2widget.cpp | 8 +- src/plugins/grass/qgsgrassnewmapset.cpp | 7 +- .../qgsdelimitedtextfeatureiterator.cpp | 3 +- .../delimitedtext/qgsdelimitedtextprovider.cpp | 8 +- src/providers/gdal/qgsgdalprovider.cpp | 10 +- src/providers/grass/qgsgrass.cpp | 31 +- src/providers/grass/qgsgrass.h | 16 +- .../oracle/ocispatial/qsql_ocispatial.cpp | 6 + src/providers/oracle/qgsoracleconn.cpp | 2 +- src/providers/oracle/qgsoraclefeatureiterator.cpp | 7 +- src/providers/oracle/qgsoraclenewconnection.cpp | 2 +- src/providers/oracle/qgsoracleprovider.cpp | 2 +- src/providers/postgres/qgspgnewconnection.cpp | 2 +- src/providers/postgres/qgspostgresconn.cpp | 46 +- src/providers/postgres/qgspostgresconn.h | 2 +- src/providers/postgres/qgspostgresdataitems.cpp | 3 +- .../postgres/qgspostgresfeatureiterator.cpp | 13 +- src/providers/postgres/qgspostgresprovider.cpp | 15 +- .../spatialite/qgsspatialitefeatureiterator.cpp | 15 + .../spatialite/qgsspatialitefeatureiterator.h | 1 + src/providers/spatialite/qgsspatialiteprovider.cpp | 2 +- src/providers/wms/qgswmscapabilities.h | 2 +- src/providers/wms/qgswmsprovider.cpp | 10 +- src/providers/wms/qgswmsprovider.h | 2 +- src/server/CMakeLists.txt | 4 + src/server/qgis_map_serv.cpp | 10 + src/server/qgshttprequesthandler.cpp | 7 +- src/server/qgsserverprojectparser.cpp | 21 +- src/server/qgsserverprojectparser.h | 4 + src/server/qgswfsserver.cpp | 12 +- src/server/qgswmsprojectparser.cpp | 211 +--- src/server/qgswmsprojectparser.h | 12 +- src/server/qgswmsserver.cpp | 69 +- src/ui/qgsattributetabledialog.ui | 25 +- src/ui/qgscategorizedsymbolrendererv2widget.ui | 11 - src/ui/qgscolordialog.ui | 2 +- src/ui/qgscomposerlegendwidgetbase.ui | 2 +- src/ui/qgsfieldspropertiesbase.ui | 2 +- src/ui/qgsoptionsbase.ui | 2 +- src/ui/qgsprojectpropertiesbase.ui | 2 +- src/ui/qgsrasterlayerpropertiesbase.ui | 2 +- src/ui/qgsrelationmanagerdialogbase.ui | 2 +- src/ui/qgsrulebasedrendererv2widget.ui | 2 +- .../qgssinglebandpseudocolorrendererwidgetbase.ui | 2 +- tests/bench/CMakeLists.txt | 6 + tests/bench/main.cpp | 18 + tests/src/gui/testqgsrubberband.cpp | 89 +- tests/src/providers/CMakeLists.txt | 1 + tests/src/providers/testqgsgdalprovider.cpp | 107 ++ tests/testdata/int_raster_with_scale.tif | Bin 0 -> 1022 bytes tests/testdata/int_raster_with_scale.tif.aux.xml | 30 + tests/testdata/requires_warped_vrt.tif | Bin 0 -> 978 bytes 234 files changed, 4595 insertions(+), 947 deletions(-) diff --cc debian/changelog index 3c54bfe,2fedf49..dd90896 --- a/debian/changelog +++ b/debian/changelog @@@ -1,91 -1,22 +1,97 @@@ + qgis (2.8.2) UNRELEASED; urgency=medium + + * Release of 2.8.2 + + -- Jürgen E. Fischer <j...@norbit.de> Sat, 09 May 2015 22:02:02 +0200 + -qgis (2.8.1) unstable; urgency=medium +qgis (2.8.1+dfsg1-1) unstable; urgency=medium + * Add patches from upstream release-2_8 branch. + * Move from experimental to unstable. + + -- 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