[mapnik] 02/07: Merge tag 'upstream/3.0.7+ds'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapnik.

commit 9399c721a04434e30d5396fe2090c630f6bb92ea
Merge: 35fb7f0 32fd7aa
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Oct 14 08:54:23 2015 +0200

    Merge tag 'upstream/3.0.7+ds'
    
    Upstream version 3.0.7+ds

 .gitignore                                         |    2 +-
 CHANGELOG.md                                       |   14 +
 INSTALL.md                                         |    6 +
 SConstruct                                         | 1962 ++++++++++----------
 appveyor.yml                                       |    2 +-
 demo/viewer/mapwidget.cpp                          |   10 +-
 include/mapnik/grid/grid_util.hpp                  |  112 --
 include/mapnik/span_image_filter.hpp               |  158 --
 include/mapnik/version.hpp                         |   11 +-
 plugins/input/csv/csv_utils.hpp                    |    2 +-
 plugins/input/geojson/geojson_datasource.cpp       |    9 +-
 plugins/input/ogr/ogr_datasource.cpp               |   28 +-
 plugins/input/pgraster/pgraster_datasource.cpp     |   21 +-
 plugins/input/postgis/postgis_datasource.cpp       |   23 +-
 plugins/input/postgis/postgis_featureset.cpp       |    4 +
 plugins/input/shape/shape_datasource.cpp           |    9 +-
 plugins/input/sqlite/sqlite_datasource.cpp         |   13 +-
 scripts/build-local.bat                            |    2 +-
 src/map.cpp                                        |   15 +-
 utils/mapnik-config/build.py                       |   18 +
 utils/mapnik-index/build.py                        |    2 +
 utils/mapnik-index/mapnik-index.cpp                |  291 +--
 utils/mapnik-index/process_csv_file.cpp            |  215 +++
 .../mapnik-index/process_csv_file.hpp              |   32 +-
 utils/mapnik-index/process_geojson_file.cpp        |   90 +
 .../mapnik-index/process_geojson_file.hpp          |   32 +-
 utils/{nik2img => mapnik-render}/build.py          |   10 +-
 .../mapnik-render.cpp}                             |    0
 28 files changed, 1482 insertions(+), 1611 deletions(-)

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