[osmcoastline] 01/02: Merge tag 'debian/2.1.3-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 07219b195adecb015221208b6828a8e02ebf81dd
Merge: 5986787 32c3907
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Apr 6 22:33:39 2016 +0200

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

 CHANGELOG.md                          | 21 ++++++++++++++-
 CMakeLists.txt                        |  2 +-
 debian/changelog                      | 14 ++++++++++
 debian/control                        |  4 +--
 debian/copyright                      |  2 +-
 debian/osmcoastline.lintian-overrides |  8 +-----
 debian/rules                          |  3 +++
 include/gdalcpp.hpp                   |  4 +++
 src/osmcoastline.cpp                  | 40 +++++----------------------
 src/osmcoastline_filter.cpp           | 49 ++++++++++++++++++++++++++++-----
 src/osmcoastline_ways.cpp             |  4 ++-
 src/output_database.cpp               | 24 ++++++++---------
 src/verbose_output.hpp                | 51 -----------------------------------
 13 files changed, 111 insertions(+), 115 deletions(-)

diff --cc debian/changelog
index 679df27,ed64e62..dc6708b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,23 @@@
+ osmcoastline (2.1.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Enable all hardening buildflags.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 31 Mar 2016 11:33:34 +0200
+ 
+ osmcoastline (2.1.2-2) unstable; urgency=medium
+ 
+   * Update Vcs-Git URL to use HTTPS.
+   * Bump Standards-Version to 3.9.7, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 02 Mar 2016 20:03:42 +0100
+ 
 +osmcoastline (2.1.2-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 12 Jan 2016 19:32:10 +0100
 +
  osmcoastline (2.1.2-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 7fae12e,3e4c895..47979aa
--- a/debian/control
+++ b/debian/control
@@@ -15,9 -15,9 +15,9 @@@ Build-Depends: debhelper (>= 9)
                 pandoc,
                 sqlite3,
                 zlib1g-dev
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmcoastline.git/
- Vcs-Git: git://anonscm.debian.org/pkg-grass/osmcoastline.git -b jessie-backports
 -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