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

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

commit 9ee54bd931117f562867379403a30e5f163f86c0
Merge: 0a93a1e 72d67b6
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Mon Sep 7 08:57:29 2015 +0200

    Merge tag 'debian/2.8.3+dfsg-3' into jessie-backports
    
    Conflicts:
        debian/changelog
        debian/control

 CMakeLists.txt                                     |   12 +-
 ChangeLog                                          |  951 +++
 cmake/FindSPATIALITE.cmake                         |    1 +
 debian/changelog                                   |   58 +
 debian/control                                     |  122 +-
 debian/control.in                                  |   88 +-
 debian/copyright                                   |    3 +-
 debian/gbp.conf                                    |    2 +-
 ...2.8.2.install => libqgis-analysis2.8.3.install} |    0
 ...8.2.postinst => libqgis-analysis2.8.3.postinst} |    0
 ...is2.8.2.postrm => libqgis-analysis2.8.3.postrm} |    0
 ...2.8.2.symbols => libqgis-analysis2.8.3.symbols} |  117 +-
 ...core2.8.2.install => libqgis-core2.8.3.install} |    0
 ...re2.8.2.postinst => libqgis-core2.8.3.postinst} |    0
 ...s-core2.8.2.postrm => libqgis-core2.8.3.postrm} |    0
 ...core2.8.2.symbols => libqgis-core2.8.3.symbols} | 1154 +--
 debian/libqgis-dev.install                         |    2 +-
 ...s-gui2.8.2.install => libqgis-gui2.8.3.install} |    0
 ...gui2.8.2.postinst => libqgis-gui2.8.3.postinst} |    0
 ...gis-gui2.8.2.postrm => libqgis-gui2.8.3.postrm} |    0
 ...s-gui2.8.2.symbols => libqgis-gui2.8.3.symbols} |  804 +-
 ...nstall => libqgis-networkanalysis2.8.3.install} |    0
 ...tinst => libqgis-networkanalysis2.8.3.postinst} |    0
 ....postrm => libqgis-networkanalysis2.8.3.postrm} |    0
 ...ymbols => libqgis-networkanalysis2.8.3.symbols} |   26 +-
 ...er2.8.2.install => libqgis-server2.8.3.install} |    0
 ...er2.8.2.symbols => libqgis-server2.8.3.symbols} |  231 +-
 ...rass2.8.2.install => libqgisgrass2.8.3.install} |    0
 ...ss2.8.2.postinst => libqgisgrass2.8.3.postinst} |    0
 ...sgrass2.8.2.postrm => libqgisgrass2.8.3.postrm} |    0
 ...rass2.8.2.symbols => libqgisgrass2.8.3.symbols} |    5 +-
 ...hon2.8.2.install => libqgispython2.8.3.install} |    0
 ...n2.8.2.postinst => libqgispython2.8.3.postinst} |    0
 ...ython2.8.2.postrm => libqgispython2.8.3.postrm} |    0
 ...hon2.8.2.symbols => libqgispython2.8.3.symbols} |   23 +-
 debian/patches/0001-fix-arm-build.patch            |    4 +-
 debian/patches/allows-to-typo.patch                |   76 +-
 .../patches/developersmap-use-debian-package.patch |    9 +-
 debian/patches/series                              |    1 +
 debian/patches/software-typo.patch                 |  524 ++
 debian/rules                                       |    9 +-
 debian/watch                                       |    9 +-
 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 +-
 252 files changed, 11628 insertions(+), 7258 deletions(-)

diff --cc debian/changelog
index 01785e5,38bc71e..bc6399a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,61 +1,67 @@@
+ qgis (2.8.3+dfsg-3) unstable; urgency=medium
+ 
+   * Update watch file to use lowercase RC in uversionmangle.
+   * Update symbols for other architectures.
+   * Rebuild for openscenegraph transition.
+ 
+  -- Bas Couwenberg <sebas...@debian.org>  Mon, 31 Aug 2015 21:24:05 +0200
+ 
+ qgis (2.8.3+dfsg-2) unstable; urgency=medium
+ 
+   * Update symbols for amd64.
+   * Add patch to fix 'software' typo.
+   * Update Vcs-Browser URL to use HTTPS.
+   * Rebuild for geos transition.
+ 
+  -- Bas Couwenberg <sebas...@debian.org>  Sat, 29 Aug 2015 17:03:40 +0200
+ 
+ qgis (2.8.3+dfsg-1) unstable; urgency=medium
+ 
+   * Update symbols for other architectures.
+   * Use upstream-ltr branch in gbp.conf.
+   * Disable GRASS plugin, doesn't support GRASS 7.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebas...@debian.org>  Fri, 21 Aug 2015 18:12:35 +0200
+ 
+ qgis (2.8.3+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.8.3
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Drop patches included upstream, refresh remaining patches.
+   * Update copyright file, changes:
+     - Update copyright years for Jürgen E. Fischer
+     - Add copyright for Daniel Vaz
+   * Update symbols for amd64.
+ 
+  -- Bas Couwenberg <sebas...@debian.org>  Thu, 30 Jul 2015 02:40:05 +0200
+ 
+ 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~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebas...@debian.org>  Fri, 10 Jul 2015 12:22:30 +0200
 +
  qgis (2.8.2+dfsg-2) unstable; urgency=medium
  
    * Move from experimental to unstable.
diff --cc debian/control
index a51abb7,59e3b4d..18e32b9
--- a/debian/control
+++ b/debian/control
@@@ -54,8 -54,8 +54,8 @@@ Build-Depends: bison
  Build-Conflicts: libqgis-dev,
                   qgis-dev
  Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/qgis.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/qgis.git
 -Vcs-Git: git://anonscm.debian.org/pkg-grass/qgis.git
 +Vcs-Git: git://anonscm.debian.org/pkg-grass/qgis.git -b jessie-backports
  Homepage: http://qgis.org/
  X-Python-Version: >= 2.7, << 2.8
  

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

Reply via email to