[qgis] 01/01: Merge tag 'debian/2.14.3+dfsg-1.exp1' into qt5
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 commit to branch qt5
in repository qgis.
commit 4771f038a8e30740c75ecf53540088e8d60a4aac
Merge: 5b91e2b a0ea205
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri May 20 17:45:06 2016 +0200
Merge tag 'debian/2.14.3+dfsg-1.exp1' into qt5
Conflicts:
debian/changelog
debian/control
debian/patches/series
.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
python/plugins/processing/images/qgis.svg | 286 +++++++++
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, 4201 insertions(+), 1015 deletions(-)
diff --cc debian/changelog
index 9787d59,074dd73..b4bf46c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,55 +1,67 @@@
- qgis (2.14.1+dfsg-2~exp1) UNRELEASED; urgency=medium
++qgis (2.14.3+dfsg-2~exp1) UNRELEASED; urgency=medium
+
+ * Update branch in gbp.conf.
+ * Switch from Qt4 to Qt5.
+ * Add patch to fix globe plugin build failure with Qt5.
+ * Add patch to fix QSpatiaLite provider build failure with Qt5.
+ * Add upstream patch to make pyuic4-wrapper PyQt5 aware.
+ * Add patch to not require Python 3 for Qt5.
+ * Add upstream patch to support building QGIS server with Qt5.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 08 May 2015 23:40:06 +0200
+
+ qgis (2.14.3+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.3
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Add patch to add support for GNU/Hurd to GRASS plugin qtermwidget.
+ * Update copyright years for Sandro Mani in copyright file.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 20 May 2016 16:31:03 +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)
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Bump Standards-Version to 3.9.8, no changes.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 29 Apr 2016 21:07:07 +0200
+
+ qgis (2.14.1+dfsg-2) unstable; urgency=medium
+
+ * Add python-shapely to python-qgis-common dependencies.
+ (closes: #820281)
+ * Update symbols for other architectures.
+
+ -- 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.
diff --cc debian/control
index 04077bf,f601ef5..d8a96ce
--- a/debian/control
+++ b/debian/control
@@@ -227,27 -224,20 +227,27 @@@ Depends: grass-dev
libgsl-dev | libgsl0-dev,
libpq-dev,
libproj-dev,
- libqgis-app2.14.1 (= ${binary:Version}),
- libqgis-core2.14.1 (= ${binary:Version}),
- libqgis-gui2.14.1 (= ${binary:Version}),
- libqgis-analysis2.14.1 (= ${binary:Version}),
- libqgis-networkanalysis2.14.1 (= ${binary:Version}),
- libqgis-server2.14.1 (= ${binary:Version}),
- libqgisgrass7-2.14.1 (= ${binary:Version}),
- libqgispython2.14.1 (= ${binary:Version}),
+ libqgis-app2.14.3 (= ${binary:Version}),
+ libqgis-core2.14.3 (= ${binary:Version}),
+ libqgis-gui2.14.3 (= ${binary:Version}),
+ libqgis-analysis2.14.3 (= ${binary:Version}),
+ libqgis-networkanalysis2.14.3 (= ${binary:Version}),
+ libqgis-server2.14.3 (= ${binary:Version}),
+ libqgisgrass7-2.14.3 (= ${binary:Version}),
+ libqgispython2.14.3 (= ${binary:Version}),
- libqt4-dev (>= 4.7.0),
+ libqca-qt5-2-dev,
+ libqca-qt5-2-plugins,
+ libqt5opengl5-dev,
+ libqt5scintilla2-dev,
+ libqt5svg5-dev,
+ libqt5sql5-sqlite,
+ libqt5webkit5-dev,
+ libqt5xmlpatterns5-dev,
+ libqwt-qt5-dev,
libsqlite3-dev,
- python-qt4 (>= 4.1.0),
- python-qt4-dev (>= 4.1.0),
- python-qt4-sql,
- qt4-designer,
+ pyqt5-dev,
+ python-pyqt5,
+ python-pyqt5.qtsql,
${misc:Depends}
Recommends: libqgis-customwidgets
Provides: qgis-dev
diff --cc debian/patches/series
index 14cff15,19eb014..6e250de
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -4,7 -4,5 +4,9 @@@ developersmap-use-debian-package.patc
exclude-elvensword-resources.patch
occurred-typo.patch
number-typo.patch
+ qtermwidget-kfreebsd.patch
+ qtermwidget-hurd.patch
+qt5-qspatialite.patch
+make-pyuic4-wrapper-PyQt5-aware.patch
+qt5-bindings.patch
+qt5-server-deprecate-usage-of-QFtp-and-remove-from-Qt5-builds.patch
--
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