[osmcoastline] 01/02: Merge tag 'debian/2.1.1-2' 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 d556a95ed2c720a2e77953d8b8a0d8e901a0b665
Merge: b8ab169 0bfe4bc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 11 13:08:55 2015 +0100

    Merge tag 'debian/2.1.1-2' into jessie-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |   16 +
 debian/control                                     |    3 +-
 ...h-to-gdalcpp.hpp.-Adds-support-for-GDAL-2.patch | 1726 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 4 files changed, 1745 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 4bf3871,e7bd49d..e58e5e4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ osmcoastline (2.1.1-2) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 05 Dec 2015 14:22:58 +0100
+ 
+ osmcoastline (2.1.1-2~exp1) experimental; urgency=medium
+ 
+   * Add upstream patch for GDAL 2.0 support.
+     (closes: #802813)
+   * Bump minimum required libosmium2-dev to 2.5.4.
+   * Add build dependency on libgdalcpp-dev for gdalcpp.hpp,
+     provided by libosmium2-dev >= 2.5.4.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 03 Dec 2015 23:15:48 +0100
+ 
 +osmcoastline (2.1.1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 08 Sep 2015 08:37:58 +0200
 +
  osmcoastline (2.1.1-1) unstable; urgency=medium
  
    * New upstream release.

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