[qgis] 02/06: Merge tag 'upstream/2.14.3+dfsg'

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri May 20 15:40:08 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 15746f901c58ae675d44a03b84e230a09189d114
Merge: 658f2e3 bf5cbed
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 20 15:03:30 2016 +0200

    Merge tag 'upstream/2.14.3+dfsg'
    
    Upstream version 2.14.3+dfsg
    
    Conflicts:
    	debian/changelog
    	debian/python-qgis.install.in

 CMakeLists.txt                                     |   2 +-
 ChangeLog                                          | 179 +++++++++++++++++++++
 debian/changelog                                   |   6 +
 ms-windows/osgeo4w/browser-grass.bat.tmpl          |   1 +
 python/PyQt/CMakeLists.txt                         |  22 ++-
 python/PyQt/PyQt4/QtCore.py                        |  40 +++++
 python/PyQt/PyQt4/{QtCore.py => QtNetwork.py}      |  16 +-
 python/PyQt/PyQt4/{QtCore.py => QtSql.py}          |  16 +-
 python/PyQt/PyQt4/{QtCore.py => QtSvg.py}          |  16 +-
 python/PyQt/PyQt4/{QtCore.py => QtTest.py}         |  16 +-
 python/PyQt/PyQt4/{QtCore.py => QtXml.py}          |  16 +-
 python/PyQt/PyQt4/{QtCore.py => uic/__init__.py}   |  19 ++-
 python/PyQt/PyQt4/uic/properties.py                |   1 +
 python/PyQt/PyQt4/{QtCore.py => uic/pyuic.py}      |  21 ++-
 python/PyQt/PyQt5/QtCore.py                        |   2 +
 python/PyQt/PyQt5/QtNetwork.py                     |   1 +
 python/PyQt/PyQt5/QtSql.py                         |   1 +
 python/PyQt/PyQt5/QtSvg.py                         |   1 +
 python/PyQt/PyQt5/QtTest.py                        |   1 +
 python/PyQt/PyQt5/QtWidgets.py                     |   2 +
 python/PyQt/PyQt5/QtXml.py                         |   1 +
 .../{PyQt4/QtCore.py => PyQt5/uic/__init__.py}     |  19 ++-
 python/PyQt/PyQt5/uic/properties.py                |   1 +
 python/PyQt/PyQt5/uic/pyuic.py                     |   1 +
 python/core/__init__.py                            |   2 +-
 python/core/symbology-ng/qgsfillsymbollayerv2.sip  |   4 +
 python/core/symbology-ng/qgslinesymbollayerv2.sip  |   1 +
 python/plugins/processing/gui/ParametersPanel.py   |   4 +-
 .../plugins/processing/gui/ScriptEditorDialog.py   |   3 +
 resources/function_help/json/$scale                |   2 +-
 scripts/qgis_fixes/fix_pyqt.py                     |  18 +--
 scripts/release.pl                                 |   6 +-
 src/app/qgisapp.cpp                                |  13 +-
 src/app/qgsfieldsproperties.cpp                    |   2 +-
 src/core/geometry/qgsgeometry.cpp                  |   2 +-
 src/core/qgsapplication.cpp                        |   4 +-
 src/core/qgsexpression.cpp                         |  16 +-
 src/core/qgsvectorlayerfeatureiterator.cpp         |  15 +-
 src/core/symbology-ng/qgsfillsymbollayerv2.cpp     |  22 +++
 src/core/symbology-ng/qgsfillsymbollayerv2.h       |   5 +-
 src/core/symbology-ng/qgslinesymbollayerv2.cpp     |   5 +
 src/core/symbology-ng/qgslinesymbollayerv2.h       |   1 +
 src/gui/qgsadvanceddigitizingdockwidget.cpp        |   4 +-
 src/gui/qgsfieldproxymodel.cpp                     |   4 +-
 src/gui/symbology-ng/qgssymbollayerv2widget.cpp    |   1 +
 .../qgsdelimitedtextfeatureiterator.cpp            |   1 +
 src/providers/mssql/qgsmssqlfeatureiterator.cpp    |   5 +-
 src/providers/ogr/qgsogrconnpool.h                 |   3 +-
 src/providers/ogr/qgsogrfeatureiterator.cpp        |  15 +-
 src/providers/ogr/qgsogrfeatureiterator.h          |   2 +-
 src/providers/ogr/qgsogrprovider.cpp               |  16 +-
 src/providers/oracle/qgsoraclefeatureiterator.cpp  |   4 +
 .../postgres/qgspostgresfeatureiterator.cpp        |   4 +-
 .../postgres/qgspostgresfeatureiterator.h          |   1 +
 .../spatialite/qgsspatialitefeatureiterator.cpp    |   4 +
 .../virtual/qgsvirtuallayerfeatureiterator.cpp     |   4 +-
 src/python/qgspythonutilsimpl.cpp                  |   6 +-
 src/server/qgswfsserver.cpp                        |  33 ++--
 tests/src/core/CMakeLists.txt                      |   1 +
 tests/src/core/testqgsconnectionpool.cpp           | 141 ++++++++++++++++
 tests/src/core/testqgsexpression.cpp               |  41 +++++
 tests/src/core/testqgsgeometry.cpp                 |   6 +
 tests/src/gui/testqgsfieldexpressionwidget.cpp     |  50 ++++++
 tests/src/python/providertestbase.py               |   5 +-
 tests/src/python/qgis_interface.py                 |   2 +-
 tests/src/python/test_qgsblendmodes.py             |   1 +
 tests/src/python/test_qgscomposition.py            |   1 +
 .../test_qgsgeometrygeneratorsymbollayerv2.py      |   2 +-
 tests/src/python/test_qgsrelationeditwidget.py     |   6 +-
 tests/src/python/test_qgssymbollayerv2.py          |  41 ++++-
 tests/src/python/test_qgsvectorlayer.py            |  11 +-
 tests/src/python/utilities.py                      |   4 +-
 72 files changed, 788 insertions(+), 157 deletions(-)

diff --cc debian/changelog
index 96369c1,8d1b55c..a402c02
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,132 -1,33 +1,138 @@@
+ qgis (2.14.3) UNRELEASED; urgency=medium
+ 
+   * Release of 2.14.3
+ 
+  -- Jürgen E. Fischer <jef at norbit.de>  Fri, 20 May 2016 14:05:10 +0200
+ 
 -qgis (2.14.2) unstable; urgency=medium
 +qgis (2.14.2+dfsg-3) UNRELEASED; urgency=medium
  
 +  * Add patch to add support for GNU/Hurd to GRASS plugin qtermwidget.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 14 May 2016 18:42:25 +0200
 +
 +qgis (2.14.2+dfsg-2) unstable; urgency=medium
 +
 +  * Add patch to add support for kFreeBSD to GRASS plugin.
 +    (closes: #824079)
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 13 May 2016 09:33:14 +0200
 +
 +qgis (2.14.2+dfsg-1) unstable; urgency=medium
 +
 +  * Disable check for new version of QGIS at startup.
 +    To re-enable the version check, edit /etc/defaults/qgis
 +    and remove --noversioncheck from QGIS_OPTS.
 +    (closes: #823283)
 +  * Update symbols for other architectures.
 +  * Move from experimental to unstable.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 11 May 2016 18:54:05 +0200
 +
 +qgis (2.14.2+dfsg-1~exp1) experimental; urgency=medium
 +
 +  [ Jürgen E. Fischer ]
    * Release of 2.14.2
 +    (closes: #822477)
  
 - -- Jürgen E. Fischer <jef at norbit.de>  Fri, 20 May 2016 14:05:09 +0200
 +  [ Bas Couwenberg ]
 +  * New upstream release.
 +  * Bump Standards-Version to 3.9.8, no changes.
 +  * Update symbols for amd64.
  
 -qgis (2.14.1) unstable; urgency=medium
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 29 Apr 2016 21:07:07 +0200
  
 -  * Release of 2.14.1
 +qgis (2.14.1+dfsg-2) unstable; urgency=medium
  
 - -- Jürgen E. Fischer <jef at norbit.de>  Fri, 29 Apr 2016 14:00:28 +0200
 +  * Add python-shapely to python-qgis-common dependencies.
 +    (closes: #820281)
 +  * Update symbols for other architectures.
  
 -qgis (2.14.0) unstable; urgency=medium
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 07 Apr 2016 07:10:22 +0200
 +
 +qgis (2.14.1+dfsg-1) unstable; urgency=medium
 +
 +  * Update symbols for other architectures.
 +  * Move from experimental to unstable.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 28 Mar 2016 11:30:58 +0200
 +
 +qgis (2.14.1+dfsg-1~exp1) experimental; urgency=medium
  
    [ Jürgen E. Fischer ]
 -  * Release of 2.14.0
 +  * Release of 2.14.1
  
    [ Bas Couwenberg ]
 -  * Fix removal of obsolete diversions for bother the grass plugin & provider.
 +  * 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.
 +  * Enable all hardening buildflags.
 +  * Drop globe-adapt-to-osgearth-2.7.patch, included upstream.
 +    Refresh remaining patches.
 +  * Update symbols for amd64.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 25 Mar 2016 16:41:46 +0100
 +
 +qgis (2.14.0+dfsg0-3) unstable; urgency=medium
 +
 +  * 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.13.0) unstable; urgency=medium
 +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.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