[qgis] branch qt5 updated (5b91e2b -> 4771f03)
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri May 20 17:04:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch qt5
in repository qgis.
from 5b91e2b Drop qt5-globe-plugin.patch, included upstream. Refresh remaining patches.
adds 053af71 Add python-shapely to python-qgis-common dependencies.
adds a789bf4 Update symbols for other architectures.
adds 06f3c21 Set distribution to unstable.
adds 435e2ec Imported Upstream version 2.14.2+dfsg
adds 41b5fae Merge tag 'upstream/2.14.2+dfsg'
adds 8d1cef4 New upstream release.
adds 0e4fa82 Bump Standards-Version to 3.9.8, no changes.
adds e73a405 Update symbols for amd64.
adds 47771ab Add lintian override for spelling-error-in-binary false positive.
adds 0cdabfc Close bug in changelog.
adds 912b945 Set distribution to experimental.
adds 8f2b5e3 Disable check for new version of QGIS at startup.
adds 38ddca1 Use /etc/default, not /etc/defaults.
adds 8cb7eb6 Update symbols for other architectures.
adds 12bf70c Set distribution to unstable.
adds c024d5a Add patch to add support for kFreeBSD to GRASS plugin.
adds 8a02fbb Set distribution to unstable.
adds bb093ae Mark qtermwidget-kfreebsd.patch as Applied-Upstream.
adds 658f2e3 Add patch to add support for GNU/Hurd to GRASS plugin qtermwidget.
adds bf5cbed Imported Upstream version 2.14.3+dfsg
adds 15746f9 Merge tag 'upstream/2.14.3+dfsg'
adds ac53df8 New upstream release.
adds 3901e52 Update copyright years for Sandro Mani in copyright file.
adds 517b4aa Update symbols for amd64.
adds a0ea205 Set distribution to experimental.
new 4771f03 Merge tag 'debian/2.14.3+dfsg-1.exp1' into qt5
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 20 +-
CMakeLists.txt | 2 +-
ChangeLog | 691 ++++++++++++++++++++-
debian/changelog | 54 +-
debian/control | 53 +-
debian/copyright | 2 +-
...14.1.install => libqgis-analysis2.14.3.install} | 0
...14.1.symbols => libqgis-analysis2.14.3.symbols} | 6 +-
...app2.14.1.install => libqgis-app2.14.3.install} | 0
...app2.14.1.symbols => libqgis-app2.14.3.symbols} | 33 +-
...re2.14.1.install => libqgis-core2.14.3.install} | 0
...re2.14.1.symbols => libqgis-core2.14.3.symbols} | 88 ++-
...gui2.14.1.install => libqgis-gui2.14.3.install} | 0
...gui2.14.1.symbols => libqgis-gui2.14.3.symbols} | 28 +-
...stall => libqgis-networkanalysis2.14.3.install} | 0
...mbols => libqgis-networkanalysis2.14.3.symbols} | 2 +-
...2.14.1.install => libqgis-server2.14.3.install} | 0
...2.14.1.symbols => libqgis-server2.14.3.symbols} | 2 +-
...2.14.1.install => libqgisgrass7-2.14.3.install} | 0
...ides => libqgisgrass7-2.14.3.lintian-overrides} | 3 +-
...2.14.1.symbols => libqgisgrass7-2.14.3.symbols} | 26 +-
...n2.14.1.install => libqgispython2.14.3.install} | 0
...n2.14.1.symbols => libqgispython2.14.3.symbols} | 2 +-
debian/patches/qtermwidget-hurd.patch | 37 ++
debian/patches/qtermwidget-kfreebsd.patch | 26 +
debian/patches/series | 2 +
debian/python-qgis.lintian-overrides | 5 +-
debian/qgis.default | 2 +
debian/qgis.sh | 6 +-
debian/rules | 8 +
ms-windows/osgeo4w/browser-grass.bat.tmpl | 1 +
ms-windows/osgeo4w/browser.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/composer/qgscomposertablev2.sip | 5 +-
python/core/conversions.sip | 29 -
python/core/qgis.sip | 11 +
python/core/qgsdataprovider.sip | 5 +
python/core/qgsnetworkaccessmanager.sip | 20 +
python/core/qgstracer.sip | 5 +
python/core/symbology-ng/qgsfillsymbollayerv2.sip | 4 +
python/core/symbology-ng/qgslinesymbollayerv2.sip | 1 +
python/core/symbology-ng/qgssymbolv2.sip | 75 ++-
.../db_manager/db_plugins/postgis/connector.py | 10 +-
.../plugins/processing/algs/gdal/ClipByExtent.py | 14 +-
python/plugins/processing/algs/gdal/ClipByMask.py | 14 +-
.../plugins/processing/algs/gdal/GdalAlgorithm.py | 13 +-
.../algs/gdal/GdalOgrAlgorithmProvider.py | 2 +-
python/plugins/processing/algs/gdal/contour.py | 6 +-
python/plugins/processing/algs/gdal/gdalcalc.py | 14 +-
python/plugins/processing/algs/gdal/rasterize.py | 14 +-
python/plugins/processing/algs/gdal/translate.py | 14 +-
python/plugins/processing/algs/gdal/warp.py | 14 +-
.../processing/algs/grass/GrassAlgorithm.py | 2 +-
.../algs/grass/GrassAlgorithmProvider.py | 2 +-
python/plugins/processing/algs/grass/GrassUtils.py | 8 +-
.../processing/algs/grass7/Grass7Algorithm.py | 2 +-
.../algs/grass7/Grass7AlgorithmProvider.py | 7 +-
.../plugins/processing/algs/grass7/Grass7Utils.py | 17 +-
.../processing/algs/otb/OTBSpecific_XMLLoading.py | 3 +-
python/plugins/processing/algs/otb/OTBUtils.py | 15 +-
python/plugins/processing/algs/qgis/Buffer.py | 4 +-
python/plugins/processing/algs/qgis/Dissolve.py | 17 +-
.../plugins/processing/algs/qgis/JoinAttributes.py | 2 +-
.../processing/algs/qgis/QGISAlgorithmProvider.py | 2 +-
.../processing/algs/qgis/ZonalStatistics.py | 24 +-
python/plugins/processing/algs/r/RAlgorithm.py | 2 +-
.../processing/algs/r/RAlgorithmProvider.py | 2 +-
python/plugins/processing/algs/r/RUtils.py | 13 +-
.../processing/algs/taudem/TauDEMAlgorithm.py | 2 +-
.../algs/taudem/TauDEMAlgorithmProvider.py | 2 +-
.../plugins/processing/algs/taudem/dinfdistdown.py | 2 +-
.../processing/algs/taudem/dinfdistdown_multi.py | 2 +-
.../plugins/processing/algs/taudem/dinfdistup.py | 2 +-
.../processing/algs/taudem/dinfdistup_multi.py | 2 +-
.../processing/algs/taudem/dinftranslimaccum.py | 2 +-
.../processing/algs/taudem/dinftranslimaccum2.py | 2 +-
.../algs/taudem/dinftranslimaccum2_multi.py | 2 +-
.../algs/taudem/dinftranslimaccum_multi.py | 2 +-
.../plugins/processing/algs/taudem/dropanalysis.py | 2 +-
.../processing/algs/taudem/dropanalysis_multi.py | 2 +-
python/plugins/processing/algs/taudem/gridnet.py | 2 +-
.../processing/algs/taudem/gridnet_multi.py | 2 +-
.../plugins/processing/algs/taudem/lengtharea.py | 2 +-
.../processing/algs/taudem/lengtharea_multi.py | 2 +-
.../processing/algs/taudem/peukerdouglas.py | 2 +-
.../processing/algs/taudem/peukerdouglas_multi.py | 2 +-
python/plugins/processing/algs/taudem/slopearea.py | 2 +-
.../processing/algs/taudem/slopearea_multi.py | 2 +-
python/plugins/processing/core/GeoAlgorithm.py | 3 +-
.../processing/gui/CreateNewScriptAction.py | 2 +-
.../plugins/processing/gui/GetScriptsAndModels.py | 4 +-
python/plugins/processing/gui/ParametersPanel.py | 4 +-
python/plugins/processing/gui/ProcessingToolbox.py | 2 -
.../plugins/processing/gui/ScriptEditorDialog.py | 3 +
python/plugins/processing/images/CMakeLists.txt | 2 +-
python/plugins/processing/images/gdal.png | Bin 734 -> 0 bytes
python/plugins/processing/images/gdal.svg | 126 ++++
python/plugins/processing/images/grass.png | Bin 750 -> 0 bytes
python/plugins/processing/images/grass.svg | 271 ++++++++
python/plugins/processing/images/qgis.png | Bin 785 -> 0 bytes
.../plugins/processing/images/qgis.svg | 0
python/plugins/processing/images/r.png | Bin 829 -> 0 bytes
python/plugins/processing/images/r.svg | 14 +
python/plugins/processing/images/taudem.png | Bin 1030 -> 0 bytes
python/plugins/processing/images/taudem.svg | 196 ++++++
.../plugins/processing/modeler/ModelerAlgorithm.py | 9 +-
.../processing/modeler/ModelerParametersDialog.py | 8 +-
python/testing/CMakeLists.txt | 2 +-
resources/function_help/json/$scale | 2 +-
scripts/qgis_fixes/fix_pyqt.py | 18 +-
scripts/release.pl | 6 +-
src/app/qgisapp.cpp | 18 +-
src/app/qgsattributetabledialog.cpp | 4 +-
src/app/qgsfieldsproperties.cpp | 2 +-
src/app/qgsrasterlayerproperties.cpp | 19 +-
src/app/qgsrasterlayerproperties.h | 7 +
src/app/qgsstatisticalsummarydockwidget.cpp | 2 +-
src/app/qgsvectorlayerproperties.cpp | 14 +-
src/app/qgsvectorlayerproperties.h | 5 +
src/core/composer/qgsatlascomposition.cpp | 19 +-
src/core/composer/qgscomposerattributetable.cpp | 56 +-
src/core/composer/qgscomposerattributetablev2.cpp | 56 +-
src/core/composer/qgscomposermap.cpp | 8 +
src/core/composer/qgscomposertablev2.cpp | 18 +-
src/core/composer/qgscomposertablev2.h | 3 +-
src/core/geometry/qgsgeometry.cpp | 8 +-
src/core/layertree/qgslayertreemodellegendnode.cpp | 4 +-
src/core/qgis.cpp | 41 ++
src/core/qgis.h | 14 +-
src/core/qgsapplication.cpp | 4 +-
src/core/qgsdataprovider.h | 5 +
src/core/qgsexpression.cpp | 24 +-
src/core/qgsexpressioncontext.cpp | 3 +
src/core/qgsmaplayer.cpp | 40 +-
src/core/qgsnetworkaccessmanager.cpp | 18 +
src/core/qgsnetworkaccessmanager.h | 19 +
src/core/qgsofflineediting.cpp | 88 +--
src/core/qgspallabeling.cpp | 330 +++++++---
src/core/qgstracer.cpp | 36 +-
src/core/qgstracer.h | 8 +
src/core/qgsvectordataprovider.cpp | 14 +
src/core/qgsvectorlayer.cpp | 69 +-
src/core/qgsvectorlayerfeatureiterator.cpp | 15 +-
src/core/qgsvectorlayerlabelprovider.cpp | 4 +-
src/core/symbology-ng/qgsellipsesymbollayerv2.cpp | 26 +-
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/core/symbology-ng/qgssymbollayerv2utils.cpp | 34 -
src/core/symbology-ng/qgssymbolv2.cpp | 70 ++-
src/core/symbology-ng/qgssymbolv2.h | 76 ++-
.../qgsattributetablefiltermodel.cpp | 36 +-
.../editorwidgets/qgsrelationreferencewidget.cpp | 22 +-
.../qgsvaluerelationwidgetwrapper.cpp | 15 +-
src/gui/qgsadvanceddigitizingdockwidget.cpp | 4 +-
src/gui/qgsfieldexpressionwidget.cpp | 6 +-
src/gui/qgsfieldproxymodel.cpp | 4 +-
src/gui/qgsmapcanvastracer.cpp | 5 +
src/gui/qgsnewnamedialog.cpp | 3 +
src/gui/symbology-ng/qgssymbollayerv2widget.cpp | 1 +
src/plugins/CMakeLists.txt | 1 +
src/plugins/globe/CMakeLists.txt | 3 +
src/plugins/globe/globe_plugin.cpp | 17 +-
.../qgsdelimitedtextfeatureiterator.cpp | 23 +-
.../delimitedtext/qgsdelimitedtextprovider.cpp | 3 +-
src/providers/memory/qgsmemoryfeatureiterator.cpp | 6 +-
src/providers/memory/qgsmemoryprovider.cpp | 1 +
src/providers/mssql/qgsmssqlfeatureiterator.cpp | 28 +-
src/providers/ogr/qgsogrconnpool.h | 3 +-
src/providers/ogr/qgsogrfeatureiterator.cpp | 27 +-
src/providers/ogr/qgsogrfeatureiterator.h | 2 +-
src/providers/ogr/qgsogrprovider.cpp | 16 +-
src/providers/oracle/qgsoraclefeatureiterator.cpp | 178 ++++--
src/providers/oracle/qgsoraclefeatureiterator.h | 1 +
.../postgres/qgspostgresfeatureiterator.cpp | 17 +-
.../postgres/qgspostgresfeatureiterator.h | 1 +
.../spatialite/qgsspatialitefeatureiterator.cpp | 17 +
src/providers/spatialite/qgsspatialiteprovider.cpp | 5 +-
src/providers/spatialite/qgsspatialiteprovider.h | 2 +
.../virtual/qgsvirtuallayerfeatureiterator.cpp | 20 +-
src/providers/virtual/qgsvirtuallayerprovider.cpp | 1 +
src/providers/wfs/qgswfsprovider.cpp | 89 +--
src/python/qgspythonutilsimpl.cpp | 6 +-
src/server/qgsconfigparserutils.cpp | 16 +-
src/server/qgsserverprojectparser.cpp | 2 +-
src/server/qgswfsserver.cpp | 45 +-
src/ui/composer/qgscomposerlegendwidgetbase.ui | 10 +-
tests/src/core/CMakeLists.txt | 1 +
tests/src/core/testqgis.cpp | 68 ++
tests/src/core/testqgsconnectionpool.cpp | 141 +++++
tests/src/core/testqgsexpression.cpp | 41 ++
tests/src/core/testqgsgeometry.cpp | 6 +
tests/src/core/testqgslegendrenderer.cpp | 37 ++
tests/src/core/testqgssimplemarker.cpp | 54 ++
tests/src/gui/testqgsfieldexpressionwidget.cpp | 107 ++++
tests/src/python/providertestbase.py | 75 ++-
tests/src/python/qgis_interface.py | 2 +-
tests/src/python/test_provider_memory.py | 2 +-
tests/src/python/test_qgsblendmodes.py | 1 +
tests/src/python/test_qgscomposition.py | 1 +
.../python/test_qgsdelimitedtextprovider_wanted.py | 54 ++
.../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 +-
.../expected_legend_mapunits.png | Bin 0 -> 11060 bytes
.../expected_legend_mapunits_mask.png | Bin 0 -> 2192 bytes
.../expected_simplemarker_boundsoffset.png | Bin 0 -> 11019 bytes
.../expected_simplemarker_boundsoffset_mask.png | Bin 0 -> 5329 bytes
.../expected_simplemarker_boundsrotation.png | Bin 0 -> 19177 bytes
.../expected_simplemarker_boundsrotation_mask.png | Bin 0 -> 6115 bytes
.../expected_simplemarker_boundsrotationoffset.png | Bin 0 -> 11845 bytes
...cted_simplemarker_boundsrotationoffset_mask.png | Bin 0 -> 3576 bytes
tests/testdata/delimitedtext/test14666.csv | 7 +
236 files changed, 3915 insertions(+), 1015 deletions(-)
rename debian/{libqgis-analysis2.14.1.install => libqgis-analysis2.14.3.install} (100%)
rename debian/{libqgis-analysis2.14.1.symbols => libqgis-analysis2.14.3.symbols} (98%)
rename debian/{libqgis-app2.14.1.install => libqgis-app2.14.3.install} (100%)
rename debian/{libqgis-app2.14.1.symbols => libqgis-app2.14.3.symbols} (99%)
rename debian/{libqgis-core2.14.1.install => libqgis-core2.14.3.install} (100%)
rename debian/{libqgis-core2.14.1.symbols => libqgis-core2.14.3.symbols} (99%)
rename debian/{libqgis-gui2.14.1.install => libqgis-gui2.14.3.install} (100%)
rename debian/{libqgis-gui2.14.1.symbols => libqgis-gui2.14.3.symbols} (99%)
rename debian/{libqgis-networkanalysis2.14.1.install => libqgis-networkanalysis2.14.3.install} (100%)
rename debian/{libqgis-networkanalysis2.14.1.symbols => libqgis-networkanalysis2.14.3.symbols} (98%)
rename debian/{libqgis-server2.14.1.install => libqgis-server2.14.3.install} (100%)
rename debian/{libqgis-server2.14.1.symbols => libqgis-server2.14.3.symbols} (99%)
rename debian/{libqgisgrass7-2.14.1.install => libqgisgrass7-2.14.3.install} (100%)
rename debian/{libqgisgrass7-2.14.1.lintian-overrides => libqgisgrass7-2.14.3.lintian-overrides} (77%)
rename debian/{libqgisgrass7-2.14.1.symbols => libqgisgrass7-2.14.3.symbols} (98%)
rename debian/{libqgispython2.14.1.install => libqgispython2.14.3.install} (100%)
rename debian/{libqgispython2.14.1.symbols => libqgispython2.14.3.symbols} (81%)
create mode 100644 debian/patches/qtermwidget-hurd.patch
create mode 100644 debian/patches/qtermwidget-kfreebsd.patch
create mode 100644 debian/qgis.default
copy python/PyQt/PyQt4/{QtCore.py => QtNetwork.py} (73%)
copy python/PyQt/PyQt4/{QtCore.py => QtSql.py} (74%)
copy python/PyQt/PyQt4/{QtCore.py => QtSvg.py} (74%)
copy python/PyQt/PyQt4/{QtCore.py => QtTest.py} (73%)
copy python/PyQt/PyQt4/{QtCore.py => QtXml.py} (74%)
copy python/PyQt/PyQt4/{QtCore.py => uic/__init__.py} (65%)
create mode 100644 python/PyQt/PyQt4/uic/properties.py
copy python/PyQt/PyQt4/{QtCore.py => uic/pyuic.py} (66%)
create mode 100644 python/PyQt/PyQt5/QtNetwork.py
create mode 100644 python/PyQt/PyQt5/QtSql.py
create mode 100644 python/PyQt/PyQt5/QtSvg.py
create mode 100644 python/PyQt/PyQt5/QtTest.py
create mode 100644 python/PyQt/PyQt5/QtXml.py
copy python/PyQt/{PyQt4/QtCore.py => PyQt5/uic/__init__.py} (65%)
create mode 100644 python/PyQt/PyQt5/uic/properties.py
create mode 100644 python/PyQt/PyQt5/uic/pyuic.py
delete mode 100644 python/plugins/processing/images/gdal.png
create mode 100644 python/plugins/processing/images/gdal.svg
delete mode 100644 python/plugins/processing/images/grass.png
create mode 100644 python/plugins/processing/images/grass.svg
delete mode 100644 python/plugins/processing/images/qgis.png
copy images/icons/qgis_icon.svg => python/plugins/processing/images/qgis.svg (100%)
delete mode 100644 python/plugins/processing/images/r.png
create mode 100644 python/plugins/processing/images/r.svg
delete mode 100644 python/plugins/processing/images/taudem.png
create mode 100644 python/plugins/processing/images/taudem.svg
create mode 100644 tests/src/core/testqgsconnectionpool.cpp
create mode 100644 tests/testdata/control_images/legend/expected_legend_mapunits/expected_legend_mapunits.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_mapunits/expected_legend_mapunits_mask.png
create mode 100644 tests/testdata/control_images/symbol_simplemarker/expected_simplemarker_boundsoffset/expected_simplemarker_boundsoffset.png
create mode 100644 tests/testdata/control_images/symbol_simplemarker/expected_simplemarker_boundsoffset/expected_simplemarker_boundsoffset_mask.png
create mode 100644 tests/testdata/control_images/symbol_simplemarker/expected_simplemarker_boundsrotation/expected_simplemarker_boundsrotation.png
create mode 100644 tests/testdata/control_images/symbol_simplemarker/expected_simplemarker_boundsrotation/expected_simplemarker_boundsrotation_mask.png
create mode 100644 tests/testdata/control_images/symbol_simplemarker/expected_simplemarker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset.png
create mode 100644 tests/testdata/control_images/symbol_simplemarker/expected_simplemarker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset_mask.png
create mode 100644 tests/testdata/delimitedtext/test14666.csv
--
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