[qgis] 01/02: Merge tag 'debian/2.8.2+dfsg-2' into jessie-backports

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Jul 10 12:34:33 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch jessie-backports
in repository qgis.

commit d3919a47b7456ce4cc3ba6e3a99fe9985c86e57c
Merge: 8c2089a 2bbc887
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 10 12:22:24 2015 +0200

    Merge tag 'debian/2.8.2+dfsg-2' into jessie-backports
    
    Conflicts:
    	debian/changelog

 CMakeLists.txt                                     |    4 +-
 ChangeLog                                          |  662 ++++++
 cmake/MacBundleMacros.cmake                        |    6 +-
 cmake_templates/Doxyfile.in                        |    1 +
 debian/changelog                                   |   34 +
 debian/control                                     |   49 +-
 debian/control.in                                  |   20 +
 debian/copyright                                   |    2 +-
 ...2.8.1.install => libqgis-analysis2.8.2.install} |    0
 ...8.1.postinst => libqgis-analysis2.8.2.postinst} |    0
 ...is2.8.1.postrm => libqgis-analysis2.8.2.postrm} |    0
 ...2.8.1.symbols => libqgis-analysis2.8.2.symbols} |   12 +-
 ...core2.8.1.install => libqgis-core2.8.2.install} |    0
 ...re2.8.1.postinst => libqgis-core2.8.2.postinst} |    0
 ...s-core2.8.1.postrm => libqgis-core2.8.2.postrm} |    0
 ...core2.8.1.symbols => libqgis-core2.8.2.symbols} |   74 +-
 ...s-gui2.8.1.install => libqgis-gui2.8.2.install} |    0
 ...gui2.8.1.postinst => libqgis-gui2.8.2.postinst} |    0
 ...gis-gui2.8.1.postrm => libqgis-gui2.8.2.postrm} |    0
 ...s-gui2.8.1.symbols => libqgis-gui2.8.2.symbols} |   24 +-
 ...nstall => libqgis-networkanalysis2.8.2.install} |    0
 ...tinst => libqgis-networkanalysis2.8.2.postinst} |    0
 ....postrm => libqgis-networkanalysis2.8.2.postrm} |    0
 ...ymbols => libqgis-networkanalysis2.8.2.symbols} |    8 +-
 ...er2.8.1.install => libqgis-server2.8.2.install} |    0
 ...er2.8.1.symbols => libqgis-server2.8.2.symbols} |   40 +-
 ...rass2.8.1.install => libqgisgrass2.8.2.install} |    0
 ...ss2.8.1.postinst => libqgisgrass2.8.2.postinst} |    0
 ...sgrass2.8.1.postrm => libqgisgrass2.8.2.postrm} |    0
 ...rass2.8.1.symbols => libqgisgrass2.8.2.symbols} |   10 +-
 ...hon2.8.1.install => libqgispython2.8.2.install} |    0
 ...n2.8.1.postinst => libqgispython2.8.2.postinst} |    0
 ...ython2.8.1.postrm => libqgispython2.8.2.postrm} |    0
 ...hon2.8.1.symbols => libqgispython2.8.2.symbols} |    6 +-
 ...-about-possible-pending-bug-in-force2d-ne.patch |   32 -
 .../0001-Add-some-GDAL-provider-unit-tests.patch   |  172 --
 ...ing-3-identical-label-candidates-in-offse.patch |   38 -
 ...FS-GetFeature-joined-fields-not-are-not-r.patch |   48 -
 ...ate-DatumTransformInfo-on-layerCrsChanged.patch |   65 -
 .../0001-Backport-of-dangling-pointer-bug.patch    |   29 -
 ...-missing-type-definitions-in-delimited-te.patch |   27 -
 .../0001-Backport-of-pull-request-1932.patch       |   25 -
 ...1-Better-default-for-COMPRESSTYPE-in-GDAL.patch |   45 -
 ...tter-default-for-a-Processing-SAGA-module.patch |   22 -
 ...ng-for-GDAL-outputs-partial-fix-for-http-.patch |  278 ---
 .../0001-Better-output-names-for-SAGA-models.patch |  141 --
 ...se-attribute-dialog-when-layer-is-removed.patch |   22 -
 ...ets-make-sure-config-can-loaded-from-the-.patch |   48 -
 ...er-of-dimensions-for-tables-with-unconstr.patch |   40 -
 ...dangling-pointers-in-QgisApp-mPrintCompos.patch |   31 -
 .../patches/0001-Fix-QgsRubberBand-refresh.patch   |  137 --
 ...erBand-visibility-behavior-followup-37171.patch |  100 -
 .../0001-Fix-QgsWmsDpiMode-enum-declaration.patch  |   22 -
 ...size-was-incorrectly-stored-in-x-position.patch |   23 -
 ...notation-distance-not-restored-in-dialog-.patch |   21 -
 ...001-Fix-handling-of-warped-VRT-refs-12264.patch |   24 -
 ...-renderer-not-working-for-reprojected-lay.patch |   52 -
 ...ct-calculation-of-priority-for-diagrams-f.patch |   23 -
 ...ct-data-type-for-GDAL-layers-with-gain-of.patch |   28 -
 ...alidity-test-in-raster-calculator-fix-112.patch |   22 -
 debian/patches/0001-Fix-primary-key-search.patch   |   34 -
 .../0001-Fix-quoting-of-xfb-run-invocation.patch   |   22 -
 ...dependant-rendering-of-diagrams-fix-10700.patch |   74 -
 ...-min-in-raster-histogram-using-mouse-also.patch |   21 -
 ...t-keys-in-attribute-table-dialog-fix-1227.patch |   73 -
 .../0001-Followup-5d15a07-also-fix-edit-role.patch |   23 -
 ...14ecc-also-fix-calculation-of-srcDataType.patch |   24 -
 debian/patches/0001-GRASS-7.0.0-API-change.patch   |   56 -
 ...rash-in-browser-when-opening-GRASS-6-maps.patch |   29 -
 ...-function-called-by-browser-item-fixes-cr.patch |  102 -
 ...ntLocator-discard-geometries-that-cannot-.patch |   65 -
 ...or-dimension-if-it-is-not-already-known-a.patch |   65 -
 ...everted-5e1b5a43-because-it-breaks-GRASS-.patch |   27 -
 ...Avoid-consecutive-quotes-when-calling-OTB.patch |   29 -
 ...ndle-non-matching-number-of-WMS-styles-an.patch |   63 -
 ...ataUtils-encode-fix-escape-also-backslash.patch |   28 -
 ...-stop-processing-after-no-REQUEST-excepti.patch |   24 -
 ...st-used-directory-for-raster-save-as-dial.patch |   53 -
 .../0001-Server-fix-bug-with-multiple-joins.patch  |   24 -
 ...v-vars-for-when-gdal-lib-is-bundled-in-ap.patch |  128 -
 ...andardise-use-of-red-minus-icon-fix-12425.patch |  142 --
 ...001-Update-CatchmentArea-FlowTracing-.txt.patch |   21 -
 .../0001-Update-CatchmentArea-Parallel-.txt.patch  |   20 -
 .../0001-Update-CatchmentArea-Recursive-.txt.patch |   21 -
 ...1-Update-Mac-bundling-for-qgis_server-lib.patch |   63 -
 ...ilevelB-SplineInterpolation-fromGrid-.txt.patch |   21 -
 ...pdate-MultilevelB-SplineInterpolation.txt.patch |   21 -
 .../patches/0001-Update-ShapestoGrid.txt-2.patch   |   22 -
 debian/patches/0001-Update-ShapestoGrid.txt.patch  |   32 -
 .../0001-Update-Slope-Aspect-Curvature.txt.patch   |   31 -
 ...0001-Use-ST_Force2D-from-PostGIS-2.1.0-up.patch |   26 -
 ...es-to-Processing-algs-fix-for-http-hub.qg.patch |  134 --
 .../patches/0001-adding-french-translators.patch   |   21 -
 ...ttribute-table-ShowVisible-behaviour-mode.patch |   52 -
 ...-ada01603cb7b10786436aa0ed2361743b52ce48f.patch |   41 -
 debian/patches/0001-better-option-text.patch       |   21 -
 ...tribute-table-fix-changing-header-font-fi.patch |   23 -
 ...fix-setting-of-contrast-enhancement-for-s.patch |   52 -
 .../0001-doxygen-add-effects-directory.patch       |   21 -
 debian/patches/0001-dxf-export-2.patch             |  176 --
 ...fix-data-defined-outline-color-of-simple-.patch |   22 -
 debian/patches/0001-dxf-export.patch               |  147 --
 ...builder-widget-save-scripts-in-the-same-m.patch |   24 -
 ...ressions-fix-modulo-0-crashes-fixes-12431.patch |   42 -
 debian/patches/0001-fix-GRASS7-v.generalize.patch  |   21 -
 ...-fix-SAGA-2.1.3-Kernel-Density-Estimation.patch |   22 -
 .../0001-fix-SAGA-contour-lines-from-grid.patch    |   20 -
 ...sterize-when-using-an-existing-raster-lay.patch |   59 -
 ...x-gdal_rasterize-remove-duplicate-options.patch |   87 -
 ...-editing-of-scales-in-rule-based-renderer.patch |   25 -
 .../0001-fix-saga-catchment-area-modules.patch     |   60 -
 .../0001-fix-saga-interpolations-modules.patch     |   75 -
 debian/patches/0001-fix-saga-shapes-to-grid.patch  |   33 -
 debian/patches/0001-fix-typo.patch                 |   20 -
 ...lause-when-multiple-features-are-filtered.patch |   79 -
 .../0001-german-translation-fix-fixes-12231.patch  |  163 --
 .../patches/0001-german-translation-update-2.patch | 2438 --------------------
 .../patches/0001-german-translation-update-3.patch |  199 --
 .../patches/0001-german-translation-update.patch   |  549 -----
 ...nter-to-message-in-connection-error-messa.patch |   35 -
 ...nclude-qgslayerdefinition.sip-in-bindings.patch |   50 -
 ...vas-update-sip-bindings-followup-bef4059f.patch |   34 -
 ...ial-use-sdo_relate-for-exact-intersect-fe.patch |   32 -
 ...lect-packagename-and-version-in-nightly-b.patch |   37 -
 ...ta-items-don-t-set-srid-for-geometryless-.patch |   24 -
 ...ovider-also-apply-filterWhereClause-to-fe.patch |   36 -
 ...ovider-also-cast-field-expressions-to-tex.patch |   47 -
 ...ovider-restore-behaviour-to-keep-3d-wkb-r.patch |   72 -
 ...ovider-use-min-max-before-casting-followu.patch |   95 -
 .../0001-processing-TauDEM-provider-overhaul.patch | 2210 ------------------
 ...correctly-handle-tiny-polygons-smaller-th.patch |   27 -
 ...display-X-and-Y-labels-on-the-scatterplot.patch |   22 -
 ...fix-error-in-MultipleFileInput-selector-w.patch |   23 -
 ...fix-handling-of-Check-for-edge-contaminat.patch |  119 -
 ...fix-interpretation-of-oracle-layers-fixes.patch |   63 -
 ...-fix-typo-in-the-algorithm-name-fix-12227.patch |  333 ---
 ...save-last-used-models-scripts-directory-f.patch |   61 -
 ...cessing-set-CRS-for-output-grid-fix-12518.patch |   59 -
 ...l-driver-cleanup-session-connection-when-.patch |   29 -
 .../patches/0001-remove-duplicate-condition.patch  |   25 -
 ...-unused-button-in-categorized-renderer-ui.patch |   49 -
 ...ce-service-wms-from-request-if-not-explic.patch |   31 -
 ...-server-fix-LayerDrawingOrder-fixes-12484.patch |  403 ----
 ...parsing-of-bbox-numbers-in-scientific-not.patch |  139 --
 debian/patches/0001-translation-string-fix.patch   |   21 -
 .../0001-update_ts.sh-include-locations.patch      |   22 -
 ...es-of-swedish-translators-as-requested-by.patch |   23 -
 ...layer-connect-missing-edit-buffer-signals.patch |   46 -
 debian/patches/allows-to-typo.patch                |  589 ++++-
 debian/patches/series                              |  114 -
 debian/rules                                       |    5 +-
 debian/watch                                       |    2 +-
 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
 381 files changed, 5334 insertions(+), 12883 deletions(-)

diff --cc debian/changelog
index ee19d78,b67b317..037a34a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,37 +1,44 @@@
+ qgis (2.8.2+dfsg-2) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at 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 <sebastic at 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 <sebastic at 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
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Drop patches included upstream, refresh remaining patches.
+   * Update copyright years for Alexander Bruy.
+   * Update symbols for amd64.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 10 May 2015 11:42:23 +0200
+ 
 +qgis (2.8.1+dfsg1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf and Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 11 May 2015 21:41:45 +0200
 +
  qgis (2.8.1+dfsg1-1) unstable; urgency=medium
  
    * Add patches from upstream release-2_8 branch.

-- 
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