[mapnik] branch upstream updated (4cbbc30 -> 48e5ccb)

[Bas Couwenberg]

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

sebastic pushed a change to branch upstream
in repository mapnik.

      from  4cbbc30   Imported Upstream version 3.0.12~rc1+ds
       new  48e5ccb   Imported Upstream version 3.0.12~rc2+ds

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                             |  4 ++--
 bootstrap.sh                            | 25 ++++++++++++++++++-------
 circle.yml                              |  2 +-
 include/mapnik/cairo/cairo_context.hpp  |  4 ++++
 include/mapnik/cairo/cairo_renderer.hpp |  1 +
 src/cairo/cairo_context.cpp             | 18 ++++++++++++++++++
 src/cairo/cairo_renderer.cpp            | 31 ++++++++++++++++++++++++++-----
 src/expression_node.cpp                 |  4 ++--
 src/load_map.cpp                        |  2 +-
 src/map.cpp                             |  2 +-
 src/marker_cache.cpp                    |  2 +-
 test/unit/core/expressions_test.cpp     | 18 +++++++++++++++---
 12 files changed, 90 insertions(+), 23 deletions(-)

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