[mapnik] branch master updated (05c5a5d -> a7f0957)

[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  05c5a5d   Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/mapnik
       new  dd0aa06   Don't include nik2img by upstream request.
       new  a7f0957   Add changelog section for Jérémy.

The 2 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:
 debian/changelog             |  8 ++++--
 debian/manpages/nik2img.1    | 62 --------------------------------------------
 debian/mapnik-utils.install  |  1 -
 debian/mapnik-utils.manpages |  1 -
 debian/rules                 |  2 ++
 5 files changed, 8 insertions(+), 66 deletions(-)
 delete mode 100644 debian/manpages/nik2img.1

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