[qgis] branch master updated (37bf42c -> 168aed2)
Bas Couwenberg
sebastic at debian.org
Sat Sep 24 07:45:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch master
in repository qgis.
from 37bf42c Set distribution to unstable.
new 32a1925 Imported Upstream version 2.14.7+dfsg
new 5d7a4eb Merge tag 'upstream/2.14.7+dfsg'
new 2d64b38 New upstream release.
new be7a2ba Update copyright file.
new 51765d8 Install PyQt4 files in python-qgis package.
new 168aed2 Re-enable QtWebKit support using embedded copy.
The 6 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:
CMakeLists.txt | 2 +-
ChangeLog | 826 ++++++++++++++-------
debian/changelog | 14 +
debian/control | 51 +-
debian/copyright | 16 +
...14.6.install => libqgis-analysis2.14.7.install} | 0
...14.6.symbols => libqgis-analysis2.14.7.symbols} | 2 +-
...app2.14.6.install => libqgis-app2.14.7.install} | 0
...app2.14.6.symbols => libqgis-app2.14.7.symbols} | 2 +-
...re2.14.6.install => libqgis-core2.14.7.install} | 0
...re2.14.6.symbols => libqgis-core2.14.7.symbols} | 2 +-
...gui2.14.6.install => libqgis-gui2.14.7.install} | 0
...gui2.14.6.symbols => libqgis-gui2.14.7.symbols} | 2 +-
...stall => libqgis-networkanalysis2.14.7.install} | 0
...mbols => libqgis-networkanalysis2.14.7.symbols} | 2 +-
...2.14.6.install => libqgis-server2.14.7.install} | 0
...2.14.6.symbols => libqgis-server2.14.7.symbols} | 2 +-
...2.14.6.install => libqgisgrass7-2.14.7.install} | 0
...ides => libqgisgrass7-2.14.7.lintian-overrides} | 2 +-
...2.14.6.symbols => libqgisgrass7-2.14.7.symbols} | 2 +-
...n2.14.6.install => libqgispython2.14.7.install} | 0
...n2.14.6.symbols => libqgispython2.14.7.symbols} | 2 +-
debian/python-qgis.install | 1 +
debian/rules | 5 +-
python/CMakeLists.txt | 12 +
python/QtWebKit/QtWebKitmod.sip | 63 ++
python/{PyQt/PyQt5 => QtWebKit}/__init__.py | 0
python/QtWebKit/qgraphicswebview.sip | 150 ++++
python/QtWebKit/qwebdatabase.sip | 46 ++
python/QtWebKit/qwebelement.sip | 144 ++++
python/QtWebKit/qwebframe.sip | 244 ++++++
python/QtWebKit/qwebhistory.sip | 104 +++
python/QtWebKit/qwebhistoryinterface.sip | 40 +
python/QtWebKit/qwebinspector.sip | 48 ++
python/QtWebKit/qwebkitglobal.sip | 37 +
python/QtWebKit/qwebkitversion.sip | 37 +
python/QtWebKit/qwebpage.sip | 522 +++++++++++++
python/QtWebKit/qwebpluginfactory.sip | 88 +++
python/QtWebKit/qwebsecurityorigin.sip | 56 ++
python/QtWebKit/qwebsettings.sip | 237 ++++++
python/QtWebKit/qwebview.sip | 167 +++++
python/core/geometry/qgsabstractgeometryv2.sip | 6 +
python/core/geometry/qgslinestringv2.sip | 4 +
python/core/geometry/qgsmultilinestringv2.sip | 4 +
python/core/geometry/qgsmultipolygonv2.sip | 4 +
python/core/geometry/qgspolygonv2.sip | 4 +
python/core/qgsstringutils.sip | 19 +
python/core/qgsvectordataprovider.sip | 4 +
python/gui/qgsmessagebar.sip | 4 +-
python/plugins/processing/algs/qgis/ConcaveHull.py | 4 +-
.../plugins/processing/algs/qgis/Intersection.py | 6 +-
python/plugins/processing/algs/qgis/MeanCoords.py | 11 +-
.../algs/qgis/SinglePartsToMultiparts.py | 4 +-
python/plugins/processing/core/parameters.py | 2 +-
.../plugins/processing/gui/AlgorithmDialogBase.py | 3 -
.../processing/ui/DlgGetScriptsAndModels.ui | 5 -
src/analysis/vector/qgsgeometryanalyzer.cpp | 59 +-
src/analysis/vector/qgsgeometryanalyzer.h | 10 +-
src/app/main.cpp | 94 ++-
src/app/qgsidentifyresultsdialog.cpp | 2 +
src/app/qgssnappingdialog.cpp | 2 +-
src/core/auth/qgsauthmanager.cpp | 8 +-
src/core/geometry/qgsabstractgeometryv2.h | 6 +
src/core/geometry/qgsgeometry.cpp | 5 +
src/core/geometry/qgslinestringv2.cpp | 8 +
src/core/geometry/qgslinestringv2.h | 3 +
src/core/geometry/qgsmultilinestringv2.cpp | 11 +
src/core/geometry/qgsmultilinestringv2.h | 3 +
src/core/geometry/qgsmultipolygonv2.cpp | 10 +
src/core/geometry/qgsmultipolygonv2.h | 3 +
src/core/geometry/qgspolygonv2.cpp | 12 +
src/core/geometry/qgspolygonv2.h | 3 +
src/core/qgsexpression.cpp | 14 +-
src/core/qgslegendrenderer.cpp | 46 +-
src/core/qgspallabeling.cpp | 71 +-
src/core/qgspointlocator.cpp | 1 +
src/core/qgspointlocator.h | 2 +-
src/core/qgsstringutils.cpp | 50 ++
src/core/qgsstringutils.h | 18 +
src/core/qgsvectordataprovider.cpp | 109 ++-
src/core/qgsvectordataprovider.h | 4 +
src/core/qgsvectorlayer.cpp | 7 +-
src/core/qgsvectorlayerfeatureiterator.cpp | 287 ++++---
src/core/qgsvectorlayerfeatureiterator.h | 29 +-
src/core/qgsvectorlayerlabelprovider.h | 2 +
src/core/symbology-ng/qgsvectorcolorrampv2.cpp | 5 +-
src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp | 1 +
.../qgsdelimitedtextfeatureiterator.cpp | 10 +-
.../delimitedtext/qgsdelimitedtextfile.cpp | 10 +-
src/providers/ogr/qgsogrconnpool.h | 3 +-
src/providers/ogr/qgsogrfeatureiterator.cpp | 7 +
src/providers/ogr/qgsogrprovider.cpp | 177 ++++-
src/providers/ogr/qgsogrprovider.h | 8 +
src/providers/postgres/qgspostgresdataitems.cpp | 8 +-
src/providers/postgres/qgspostgresprovider.cpp | 7 +-
.../spatialite/qgsspatialitesourceselect.cpp | 4 +
.../virtual/qgsvirtuallayerqueryparser.cpp | 6 +-
.../virtual/qgsvirtuallayersqlitemodule.cpp | 19 +-
tests/src/core/testqgsexpression.cpp | 1 +
tests/src/core/testqgslabelingenginev2.cpp | 60 ++
tests/src/core/testqgslegendrenderer.cpp | 62 ++
tests/src/python/test_provider_ogr_gpkg.py | 164 ++++
tests/src/python/test_provider_virtual.py | 14 +
tests/src/python/test_qgsfeatureiterator.py | 88 ++-
.../expected_legend_2_by_2.png | Bin 0 -> 4515 bytes
.../expected_legend_2_by_2_mask.png | Bin 0 -> 1198 bytes
.../expected_legend_3_by_2.png | Bin 0 -> 5364 bytes
.../expected_legend_3_by_2_mask.png | Bin 0 -> 1491 bytes
.../expected_legend_3_by_3.png | Bin 0 -> 5800 bytes
.../expected_legend_3_by_3_mask.png | Bin 0 -> 1526 bytes
.../expected_legend_4_by_2.png | Bin 0 -> 5472 bytes
.../expected_legend_4_by_2_mask.png | Bin 0 -> 1676 bytes
.../expected_legend_4_by_3.png | Bin 0 -> 6529 bytes
.../expected_legend_4_by_3_mask.png | Bin 0 -> 1855 bytes
.../expected_legend_5_by_2.png | Bin 0 -> 6661 bytes
.../expected_legend_5_by_2_mask.png | Bin 0 -> 1964 bytes
.../expected_legend_5_by_3.png | Bin 0 -> 6870 bytes
.../expected_legend_5_by_3_mask.png | Bin 0 -> 2045 bytes
.../expected_legend_6_by_3.png | Bin 0 -> 7470 bytes
.../expected_legend_6_by_3_mask.png | Bin 0 -> 2226 bytes
.../expected_legend_7_by_3.png | Bin 0 -> 8244 bytes
.../expected_legend_7_by_3_mask.png | Bin 0 -> 2539 bytes
122 files changed, 3951 insertions(+), 594 deletions(-)
rename debian/{libqgis-analysis2.14.6.install => libqgis-analysis2.14.7.install} (100%)
rename debian/{libqgis-analysis2.14.6.symbols => libqgis-analysis2.14.7.symbols} (99%)
rename debian/{libqgis-app2.14.6.install => libqgis-app2.14.7.install} (100%)
rename debian/{libqgis-app2.14.6.symbols => libqgis-app2.14.7.symbols} (99%)
rename debian/{libqgis-core2.14.6.install => libqgis-core2.14.7.install} (100%)
rename debian/{libqgis-core2.14.6.symbols => libqgis-core2.14.7.symbols} (99%)
rename debian/{libqgis-gui2.14.6.install => libqgis-gui2.14.7.install} (100%)
rename debian/{libqgis-gui2.14.6.symbols => libqgis-gui2.14.7.symbols} (99%)
rename debian/{libqgis-networkanalysis2.14.6.install => libqgis-networkanalysis2.14.7.install} (100%)
rename debian/{libqgis-networkanalysis2.14.6.symbols => libqgis-networkanalysis2.14.7.symbols} (98%)
rename debian/{libqgis-server2.14.6.install => libqgis-server2.14.7.install} (100%)
rename debian/{libqgis-server2.14.6.symbols => libqgis-server2.14.7.symbols} (99%)
rename debian/{libqgisgrass7-2.14.6.install => libqgisgrass7-2.14.7.install} (100%)
rename debian/{libqgisgrass7-2.14.6.lintian-overrides => libqgisgrass7-2.14.7.lintian-overrides} (70%)
rename debian/{libqgisgrass7-2.14.6.symbols => libqgisgrass7-2.14.7.symbols} (99%)
rename debian/{libqgispython2.14.6.install => libqgispython2.14.7.install} (100%)
rename debian/{libqgispython2.14.6.symbols => libqgispython2.14.7.symbols} (81%)
create mode 100644 python/QtWebKit/QtWebKitmod.sip
copy python/{PyQt/PyQt5 => QtWebKit}/__init__.py (100%)
create mode 100644 python/QtWebKit/qgraphicswebview.sip
create mode 100644 python/QtWebKit/qwebdatabase.sip
create mode 100644 python/QtWebKit/qwebelement.sip
create mode 100644 python/QtWebKit/qwebframe.sip
create mode 100644 python/QtWebKit/qwebhistory.sip
create mode 100644 python/QtWebKit/qwebhistoryinterface.sip
create mode 100644 python/QtWebKit/qwebinspector.sip
create mode 100644 python/QtWebKit/qwebkitglobal.sip
create mode 100644 python/QtWebKit/qwebkitversion.sip
create mode 100644 python/QtWebKit/qwebpage.sip
create mode 100644 python/QtWebKit/qwebpluginfactory.sip
create mode 100644 python/QtWebKit/qwebsecurityorigin.sip
create mode 100644 python/QtWebKit/qwebsettings.sip
create mode 100644 python/QtWebKit/qwebview.sip
create mode 100644 tests/src/python/test_provider_ogr_gpkg.py
create mode 100644 tests/testdata/control_images/legend/expected_legend_2_by_2/expected_legend_2_by_2.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_2_by_2/expected_legend_2_by_2_mask.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_3_by_2/expected_legend_3_by_2.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_3_by_2/expected_legend_3_by_2_mask.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_3_by_3/expected_legend_3_by_3.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_3_by_3/expected_legend_3_by_3_mask.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_4_by_2/expected_legend_4_by_2.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_4_by_2/expected_legend_4_by_2_mask.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_4_by_3/expected_legend_4_by_3.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_4_by_3/expected_legend_4_by_3_mask.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_5_by_2/expected_legend_5_by_2.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_5_by_2/expected_legend_5_by_2_mask.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_5_by_3/expected_legend_5_by_3.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_5_by_3/expected_legend_5_by_3_mask.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_6_by_3/expected_legend_6_by_3.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_6_by_3/expected_legend_6_by_3_mask.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_7_by_3/expected_legend_7_by_3.png
create mode 100644 tests/testdata/control_images/legend/expected_legend_7_by_3/expected_legend_7_by_3_mask.png
--
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