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

[Bas 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 3b80ad2940610f80ba9240a71cab484ed3b0fe3b
Merge: f14cc8e 2801dd0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Sep 22 07:15:39 2016 +0200

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

 .travis.yml                       | 144 ++++++++++++++++++++++++++++++++++++++
 .ycm_extra_conf.py                |   5 ++
 CHANGELOG.md                      |  22 ++++--
 CMakeLists.txt                    |  27 +++++--
 README.md                         |   1 +
 debian/changelog                  |  13 ++++
 debian/control                    |   2 +-
 debian/watch                      |   2 +-
 src/CMakeLists.txt                |   6 +-
 src/coastline_handlers.hpp        |  17 ++---
 src/coastline_polygons.cpp        |  38 +++++-----
 src/coastline_polygons.hpp        |  15 ++--
 src/coastline_ring.cpp            |  17 +++--
 src/coastline_ring.hpp            |  20 ++++--
 src/coastline_ring_collection.cpp |  59 +++++++++-------
 src/coastline_ring_collection.hpp |  33 +++++----
 src/options.cpp                   |  36 +++++-----
 src/options.hpp                   |   2 +-
 src/osmcoastline.cpp              |  51 +++++++++-----
 src/osmcoastline_filter.cpp       |  40 ++++++-----
 src/osmcoastline_segments.cpp     |  46 +++++++-----
 src/osmcoastline_ways.cpp         |  55 +++++++++------
 src/output_database.cpp           |  28 ++++----
 src/output_database.hpp           |   7 +-
 src/srs.cpp                       |   1 +
 src/srs.hpp                       |   5 +-
 taginfo.json                      |   2 +-
 27 files changed, 481 insertions(+), 213 deletions(-)

diff --cc debian/changelog
index 0c2922e,2ae2d9a..c0f614d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ osmcoastline (2.1.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 16 Sep 2016 20:42:39 +0200
+ 
+ osmcoastline (2.1.3-2) unstable; urgency=medium
+ 
+   * Bump Standards-Version to 3.9.8, no changes.
+   * Update watch file to handle more tag conventions in filenamemangle.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 01 Jun 2016 17:58:26 +0200
+ 
 +osmcoastline (2.1.3-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 06 Apr 2016 22:34:33 +0200
 +
  osmcoastline (2.1.3-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 47979aa,69333da..be846c2
--- a/debian/control
+++ b/debian/control
@@@ -15,9 -15,9 +15,9 @@@ Build-Depends: debhelper (>= 9)
                 pandoc,
                 sqlite3,
                 zlib1g-dev
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmcoastline.git/
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmcoastline.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmcoastline.git -b jessie-backports
  Homepage: http://osmcode.org/osmcoastline/
  
  Package: osmcoastline

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