[qgis] branch upstream updated (bc1bc45 -> 956f181)
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Dec 1 22:37:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch upstream
in repository qgis.
from bc1bc45 Imported Upstream version 2.12.0+dfsg
new 956f181 Imported Upstream version 2.12.1+dfsg
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:
CMakeLists.txt | 2 +-
ChangeLog | 448 +++++++++++++++++++++
ci/travis/linux/before_install.sh | 2 -
ci/travis/linux/install.sh | 1 -
debian/changelog | 10 +-
images/svg/shopping/shopping_diy.svg | 226 +++++++----
images/svg/shopping/shopping_estateagent.svg | 117 ++++--
images/svg/shopping/shopping_estateagent2.svg | 87 ++--
images/svg/shopping/shopping_gift.svg | 219 +++++-----
images/svg/shopping/shopping_hairdresser.svg | 143 ++++---
images/svg/shopping/shopping_hifi.svg | 163 ++++----
images/svg/shopping/shopping_jewelry.svg | 129 ++++--
images/svg/shopping/shopping_mobile_phone.svg | 165 ++++----
images/svg/shopping/shopping_music.svg | 234 ++++++-----
images/svg/shopping/shopping_pet.svg | 152 +++----
images/svg/shopping/shopping_pet2.svg | 320 +++++++--------
images/svg/shopping/shopping_photo.svg | 163 ++++----
images/svg/shopping/shopping_supermarket.svg | 95 +++--
images/svg/shopping/shopping_tackle.svg | 168 ++++----
images/svg/shopping/shopping_video_rental.svg | 146 ++++---
ms-windows/osgeo4w/package-nightly.cmd | 8 +-
ms-windows/osgeo4w/package.cmd | 9 +-
python/core/symbology-ng/qgsfillsymbollayerv2.sip | 10 +-
python/core/symbology-ng/qgslinesymbollayerv2.sip | 2 +-
python/core/symbology-ng/qgssymbolv2.sip | 5 +
.../plugins/db_manager/db_plugins/oracle/TODO.md | 4 -
python/plugins/db_manager/dlg_sql_window.py | 2 +-
python/plugins/fTools/tools/doGeoprocessing.py | 38 +-
python/plugins/processing/algs/qgis/Clip.py | 4 +-
.../plugins/processing/algs/qgis/Intersection.py | 4 +-
python/plugins/processing/algs/qgis/Union.py | 38 +-
scripts/generate_test_mask_image.py | 191 ++++-----
scripts/tsstat.pl | 2 +-
src/app/nodetool/qgsmaptoolnodetool.cpp | 17 +-
src/app/qgsfieldcalculator.cpp | 18 +-
src/app/qgsprojectproperties.cpp | 5 +-
src/core/auth/qgsauthcertutils.h | 4 +-
src/core/auth/qgsauthmanager.cpp | 4 +
src/core/geometry/qgscircularstringv2.cpp | 8 +-
src/core/geometry/qgscurvepolygonv2.cpp | 6 +
src/core/geometry/qgsgeometryutils.cpp | 4 +-
src/core/geometry/qgsgeos.cpp | 22 +-
src/core/geometry/qgslinestringv2.cpp | 24 +-
src/core/geometry/qgsmultipointv2.cpp | 13 +-
src/core/geometry/qgspointv2.cpp | 16 +-
src/core/geometry/qgspointv2.h | 4 +-
src/core/layertree/qgslayertreegroup.cpp | 6 +-
src/core/pal/labelposition.cpp | 41 +-
src/core/pal/pointset.cpp | 4 +-
src/core/qgsexpression.cpp | 2 +-
src/core/qgsmaplayer.cpp | 1 +
src/core/qgsmaptopixelgeometrysimplifier.cpp | 11 +-
src/core/qgsvectorfilewriter.cpp | 7 +-
src/core/qgsvectorlayer.cpp | 19 +-
src/core/qgsvectorlayereditutils.cpp | 7 +
src/core/qgsvectorlayerfeatureiterator.cpp | 11 +
src/core/qgsvectorlayerrenderer.cpp | 40 +-
src/core/symbology-ng/qgsellipsesymbollayerv2.cpp | 17 +-
src/core/symbology-ng/qgsellipsesymbollayerv2.h | 5 +-
src/core/symbology-ng/qgsfillsymbollayerv2.cpp | 27 +-
src/core/symbology-ng/qgsfillsymbollayerv2.h | 3 +-
src/core/symbology-ng/qgslinesymbollayerv2.cpp | 23 +-
src/core/symbology-ng/qgsrulebasedrendererv2.cpp | 11 +-
src/core/symbology-ng/qgssymbollayerv2.cpp | 15 +-
src/core/symbology-ng/qgssymbollayerv2utils.cpp | 6 +-
src/core/symbology-ng/qgssymbolv2.cpp | 10 +
src/core/symbology-ng/qgssymbolv2.h | 5 +
.../qgsdefaultsearchwidgetwrapper.cpp | 6 +-
.../editorwidgets/qgsrelationreferencewidget.cpp | 2 +-
.../qgsvaluemapsearchwidgetwrapper.cpp | 31 +-
.../editorwidgets/qgsvaluemapsearchwidgetwrapper.h | 17 +-
.../qgsvaluerelationsearchwidgetwrapper.cpp | 42 +-
.../qgsvaluerelationsearchwidgetwrapper.h | 30 +-
src/plugins/geometry_checker/CMakeLists.txt | 2 +
.../geometry_checker/checks/qgsgeometrycheck.h | 2 +
.../geometry_checker/qgsgeometrycheckerplugin.cpp | 64 +++
.../geometry_checker/qgsgeometrycheckerplugin.h | 66 +--
src/plugins/geometry_snapper/CMakeLists.txt | 1 +
.../geometry_snapper/qgsgeometrysnapperplugin.cpp | 64 +++
.../geometry_snapper/qgsgeometrysnapperplugin.h | 67 +--
.../delimitedtext/qgsdelimitedtextprovider.cpp | 11 +-
src/providers/grass/qgis.r.in.cpp | 5 +
src/providers/grass/qgis.v.in.cpp | 2 +-
src/providers/grass/qgsgrassimport.cpp | 10 +
src/providers/grass/qgsgrassvectormaplayer.cpp | 35 +-
.../postgres/qgspostgresexpressioncompiler.cpp | 2 +-
src/providers/postgres/qgspostgresprovider.cpp | 34 +-
.../spatialite/qgsspatialitefeatureiterator.cpp | 27 +-
src/providers/wms/qgswmscapabilities.cpp | 5 +
src/server/qgswfsserver.cpp | 21 +-
src/server/qgswmsconfigparser.cpp | 16 +-
src/server/qgswmsprojectparser.cpp | 1 +
tests/src/core/CMakeLists.txt | 3 +
tests/src/core/testqgsauthmanager.cpp | 6 +-
tests/src/core/testqgsexpression.cpp | 108 ++++-
tests/src/core/testqgsgeometry.cpp | 47 +++
tests/src/core/testqgslinefillsymbol.cpp | 185 +++++++++
tests/src/core/testqgsmarkerlinesymbol.cpp | 154 +++++++
tests/src/core/testqgspointpatternfillsymbol.cpp | 185 +++++++++
tests/src/providers/grass/testqgsgrassprovider.cpp | 5 +-
tests/src/python/test_qgsdelimitedtextprovider.py | 18 +-
.../python/test_qgsdelimitedtextprovider_wanted.py | 83 ++++
tests/src/python/test_qgsgeometry.py | 6 +-
tests/src/python/test_qgsvectorlayer.py | 35 +-
.../expected_rulebased_disabled_else_mask.png | Bin 0 -> 1229 bytes
.../expected_rulebased_else_mask.png | Bin 0 -> 1257 bytes
.../expected_lines-parallel-label+45_mask.png | Bin 2751 -> 3061 bytes
.../expected_line_offset/expected_line_offset.png | Bin 0 -> 40258 bytes
.../expected_line_offset_mask.png | Bin 0 -> 464 bytes
.../expected_datadefined_subsymbol.png | Bin 0 -> 7552 bytes
.../expected_datadefined_subsymbol_mask.png | Bin 0 -> 2055 bytes
.../expected_symbol_linefill.png | Bin 0 -> 7701 bytes
.../expected_symbol_linefill_mask.png | Bin 0 -> 2048 bytes
.../expected_datadefined_subsymbol.png | Bin 0 -> 641536 bytes
.../expected_datadefined_subsymbol_mask.png | Bin 0 -> 1801 bytes
.../expected_symbol_pointfill.png | Bin 0 -> 641536 bytes
tests/testdata/delimitedtext/test13749.csv | 5 +
tests/testdata/geom_data.csv | 3 +
tests/testdata/marker_line_offset.qml | 284 +++++++++++++
119 files changed, 3750 insertions(+), 1663 deletions(-)
mode change 100644 => 100755 scripts/generate_test_mask_image.py
create mode 100644 tests/src/core/testqgslinefillsymbol.cpp
create mode 100644 tests/src/core/testqgsmarkerlinesymbol.cpp
create mode 100644 tests/src/core/testqgspointpatternfillsymbol.cpp
create mode 100644 tests/testdata/control_images/expected_rulebased_disabled_else/expected_rulebased_disabled_else_mask.png
create mode 100644 tests/testdata/control_images/expected_rulebased_else/expected_rulebased_else_mask.png
create mode 100644 tests/testdata/control_images/markerlinesymbol/expected_line_offset/expected_line_offset.png
create mode 100644 tests/testdata/control_images/markerlinesymbol/expected_line_offset/expected_line_offset_mask.png
create mode 100644 tests/testdata/control_images/symbol_linefill/expected_datadefined_subsymbol/expected_datadefined_subsymbol.png
create mode 100644 tests/testdata/control_images/symbol_linefill/expected_datadefined_subsymbol/expected_datadefined_subsymbol_mask.png
create mode 100644 tests/testdata/control_images/symbol_linefill/expected_symbol_linefill/expected_symbol_linefill.png
create mode 100644 tests/testdata/control_images/symbol_linefill/expected_symbol_linefill/expected_symbol_linefill_mask.png
create mode 100644 tests/testdata/control_images/symbol_pointpatternfill/expected_datadefined_subsymbol/expected_datadefined_subsymbol.png
create mode 100644 tests/testdata/control_images/symbol_pointpatternfill/expected_datadefined_subsymbol/expected_datadefined_subsymbol_mask.png
create mode 100644 tests/testdata/control_images/symbol_pointpatternfill/expected_symbol_pointfill/expected_symbol_pointfill.png
create mode 100644 tests/testdata/delimitedtext/test13749.csv
create mode 100644 tests/testdata/marker_line_offset.qml
--
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