[osmcoastline] 01/02: Merge tag 'debian/2.1.2-1' into jessie-backports

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch jessie-backports
in repository osmcoastline.

commit e7516ae020f66e2bcd501459bfa9e80fee0a1046
Merge: a6b59f4 5e949fe
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jan 12 19:32:01 2016 +0100

    Merge tag 'debian/2.1.2-1' into jessie-backports
    
    Conflicts:
    	debian/changelog

 .ycm_extra_conf.py                                 |    2 +-
 CHANGELOG.md                                       |   23 +-
 CMakeLists.txt                                     |    8 +-
 README.md                                          |   15 +-
 cmake/FindOsmium.cmake                             |   13 +-
 debian/changelog                                   |    8 +
 debian/copyright                                   |    2 +-
 ...h-to-gdalcpp.hpp.-Adds-support-for-GDAL-2.patch | 1726 --------------------
 debian/patches/series                              |    1 -
 include/gdalcpp.hpp                                |  406 +++++
 man/manpage.template                               |    2 +-
 man/osmcoastline.md                                |    3 +
 man/osmcoastline_filter.md                         |    3 +
 man/osmcoastline_readmeta.md                       |    9 +
 man/osmcoastline_segments.md                       |    3 +
 man/osmcoastline_ways.md                           |    9 +
 osmcoastline_readmeta                              |   16 +
 src/CMakeLists.txt                                 |    4 +-
 src/coastline_handlers.hpp                         |    2 +-
 src/coastline_polygons.cpp                         |   99 +-
 src/coastline_polygons.hpp                         |   15 +-
 src/coastline_ring.cpp                             |   14 +-
 src/coastline_ring.hpp                             |    2 +-
 src/coastline_ring_collection.cpp                  |   27 +-
 src/coastline_ring_collection.hpp                  |    4 +-
 src/ogr_include.hpp                                |   42 -
 src/options.cpp                                    |   15 +-
 src/options.hpp                                    |    2 +-
 src/osmcoastline.cpp                               |   24 +-
 src/osmcoastline_filter.cpp                        |   70 +-
 src/osmcoastline_segments.cpp                      |   76 +-
 src/osmcoastline_ways.cpp                          |  115 +-
 src/output_database.cpp                            |  236 ++-
 src/output_database.hpp                            |   89 +-
 src/output_layers.cpp                              |  321 ----
 src/output_layers.hpp                              |  124 --
 src/{osmcoastline.hpp => return_codes.hpp}         |    2 +-
 src/srs.cpp                                        |    2 +-
 src/srs.hpp                                        |    2 +-
 src/stats.hpp                                      |    2 +-
 src/util.hpp                                       |   41 +
 41 files changed, 960 insertions(+), 2619 deletions(-)

diff --cc debian/changelog
index cff0fd9,0eb41f9..5da8ba0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ osmcoastline (2.1.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update copyright years for Jochen Topf.
+   * Drop GDAL 2.0 patch, included upstream.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 07 Jan 2016 07:44:30 +0100
+ 
 +osmcoastline (2.1.1-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 11 Dec 2015 13:09:19 +0100
 +
  osmcoastline (2.1.1-2) unstable; urgency=medium
  
    * Move from experimental to unstable.

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