[mapnik] 02/05: Merge tag 'upstream/3.0.12_rc7+ds'

Bas Couwenberg sebastic at debian.org
Tue Sep 6 09:54:43 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapnik.

commit 6d174396164a9a4d28eafceb268a7e49bf53c807
Merge: 231791d a414f19
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 6 11:09:20 2016 +0200

    Merge tag 'upstream/3.0.12_rc7+ds'
    
    Upstream version 3.0.12~rc7+ds

 .travis.yml                                        |  21 ++--
 Makefile                                           |  26 ++---
 appveyor.yml                                       |   8 +-
 bootstrap.sh                                       |  35 +++----
 circle.yml                                         |   2 +-
 include/mapnik/image_view_any.hpp                  |   4 +-
 .../json/extract_bounding_box_grammar_impl.hpp     |  22 -----
 include/mapnik/json/feature_grammar_impl.hpp       |  25 -----
 include/mapnik/json/generic_json.hpp               |   5 +-
 include/mapnik/json/geometry_grammar_impl.hpp      |  25 -----
 include/mapnik/json/positions_grammar.hpp          |   3 +-
 include/mapnik/json/topojson_grammar_impl.hpp      |  24 -----
 include/mapnik/raster_colorizer.hpp                |   4 +-
 include/mapnik/value.hpp                           |   1 +
 include/mapnik/warning_ignore.hpp                  |   3 +-
 mason_latest.sh                                    |   4 +-
 plugins/input/geojson/geojson_datasource.cpp       |  31 ++----
 plugins/input/geojson/geojson_datasource.hpp       |   2 +-
 plugins/input/topojson/topojson_datasource.cpp     |  12 ++-
 scripts/ensure_test_data.sh                        |  19 ++++
 scripts/publish_release.sh                         |  35 +++++++
 scripts/travis-command-wrapper.py                  | 106 +++++++++++++++++++++
 .../json/generic_json.cpp                          |  59 +++++++-----
 src/json/mapnik_topojson_grammar.cpp               |   2 +-
 src/memory_datasource.cpp                          |   8 ++
 .../unit/datasource/memory.cpp                     |  28 +++++-
 test/unit/datasource/topojson.cpp                  |   6 +-
 utils/mapnik-config/build.py                       |  10 +-
 28 files changed, 311 insertions(+), 219 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git



More information about the Pkg-grass-devel mailing list