[mapnik] branch master updated (4c8f41b -> 1b43f59)

[Bas Couwenberg]

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

sebastic pushed a change to branch master
in repository mapnik.

      from  4c8f41b   Set distribution to experimental.
       new  48e5ccb   Imported Upstream version 3.0.12~rc2+ds
       new  d533952   Merge tag 'upstream/3.0.12_rc2+ds'
       new  9cc81fd   New upstream release candidate.
       new  c8cb9de   Drop patches, applied upstream.
       new  1b43f59   Set distribution to experimental.

The 5 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 +-
 debian/changelog                        |  7 +++++++
 debian/patches/initialize-typo.patch    | 26 --------------------------
 debian/patches/occurred-typo.patch      | 15 ---------------
 debian/patches/series                   |  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 +++++++++++++++---
 16 files changed, 97 insertions(+), 66 deletions(-)
 delete mode 100644 debian/patches/initialize-typo.patch
 delete mode 100644 debian/patches/occurred-typo.patch
 delete mode 100644 debian/patches/series

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