[mapnik] branch master updated (35fb7f0 -> 25844af)

[Sebastiaan Couwenberg]

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

sebastic pushed a change to branch master
in repository mapnik.

      from  35fb7f0   Set distribution to unstable.
       new  32fd7aa   Imported Upstream version 3.0.7+ds
       new  9399c72   Merge tag 'upstream/3.0.7+ds'
       new  57475db   New upstream release.
       new  e470d6b   Don't install mapnik-render, like nik2img before the rename.
       new  1bfc918   Pass -j<N> to build and install commands too.
       new  451b9b1   Refresh patches.
       new  25844af   Set distribution to unstable.

The 7 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:
 .gitignore                                         |    2 +-
 CHANGELOG.md                                       |   14 +
 INSTALL.md                                         |    6 +
 SConstruct                                         | 1962 ++++++++++----------
 appveyor.yml                                       |    2 +-
 debian/changelog                                   |    8 +
 debian/patches/2001_ftemplate-depth.patch          |   14 +-
 debian/rules                                       |    8 +-
 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              |   20 +-
 utils/mapnik-index/process_geojson_file.cpp        |   90 +
 .../mapnik-index/process_geojson_file.hpp          |   16 +-
 utils/{nik2img => mapnik-render}/build.py          |   10 +-
 .../mapnik-render.cpp}                             |    0
 31 files changed, 1497 insertions(+), 1598 deletions(-)
 delete mode 100644 include/mapnik/grid/grid_util.hpp
 delete mode 100644 include/mapnik/span_image_filter.hpp
 create mode 100644 utils/mapnik-index/process_csv_file.cpp
 copy include/mapnik/json/value_converters.hpp => utils/mapnik-index/process_csv_file.hpp (76%)
 create mode 100644 utils/mapnik-index/process_geojson_file.cpp
 copy include/mapnik/geometry_envelope.hpp => utils/mapnik-index/process_geojson_file.hpp (78%)
 rename utils/{nik2img => mapnik-render}/build.py (74%)
 rename utils/{nik2img/nik2img.cpp => mapnik-render/mapnik-render.cpp} (100%)

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