[python-mapnik] 02/06: Merge tag 'upstream/0.0_20160317-275bfae'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository python-mapnik.

commit 726900a71a36df9fe177ff432f514fd0b3954b5d
Merge: 0535af8 9f903d8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 18 17:32:19 2016 +0100

    Merge tag 'upstream/0.0_20160317-275bfae'
    
    Upstream version 0.0~20160317-275bfae

 .travis.yml                                  | 69 ++++++++++++++---------
 bootstrap.sh                                 | 48 +++++++++-------
 mapnik/mapnik_settings.py                    |  6 +-
 setup.py                                     | 82 ++++++++++++----------------
 src/mapnik_color.cpp                         |  9 +--
 src/mapnik_coord.cpp                         | 10 +---
 src/mapnik_datasource.cpp                    | 11 +---
 src/mapnik_datasource_cache.cpp              |  9 +--
 src/mapnik_enumeration.hpp                   |  3 +
 src/mapnik_enumeration_wrapper_converter.hpp |  4 +-
 src/mapnik_envelope.cpp                      | 11 +---
 src/mapnik_expression.cpp                    | 11 +---
 src/mapnik_feature.cpp                       | 13 +----
 src/mapnik_featureset.cpp                    | 11 +---
 src/mapnik_font_engine.cpp                   | 11 +---
 src/mapnik_fontset.cpp                       | 12 +---
 src/mapnik_gamma_method.cpp                  | 10 +---
 src/mapnik_geometry.cpp                      | 14 +----
 src/mapnik_grid.cpp                          | 11 +---
 src/mapnik_grid_view.cpp                     | 11 +---
 src/mapnik_image.cpp                         | 11 +---
 src/mapnik_image_view.cpp                    | 11 +---
 src/mapnik_label_collision_detector.cpp      | 11 +---
 src/mapnik_layer.cpp                         | 11 +---
 src/mapnik_logger.cpp                        | 13 +----
 src/mapnik_map.cpp                           | 12 +---
 src/mapnik_palette.cpp                       | 15 ++---
 src/mapnik_parameters.cpp                    | 11 +---
 src/mapnik_proj_transform.cpp                | 12 +---
 src/mapnik_projection.cpp                    | 11 +---
 src/mapnik_python.cpp                        | 10 +---
 src/mapnik_query.cpp                         | 14 ++---
 src/mapnik_raster_colorizer.cpp              | 11 +---
 src/mapnik_rule.cpp                          | 11 +---
 src/mapnik_scaling_method.cpp                |  9 +--
 src/mapnik_style.cpp                         | 11 +---
 src/mapnik_svg.hpp                           |  5 ++
 src/mapnik_symbolizer.cpp                    | 13 +----
 src/mapnik_text_placement.cpp                | 11 +---
 src/mapnik_threads.hpp                       |  4 ++
 src/mapnik_value_converter.hpp               |  5 +-
 src/mapnik_view_transform.cpp                |  9 +--
 src/python_grid_utils.cpp                    |  9 +--
 src/python_grid_utils.hpp                    |  8 ++-
 src/python_optional.hpp                      |  3 +
 src/python_to_value.hpp                      |  9 +--
 46 files changed, 209 insertions(+), 417 deletions(-)

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