[gdal-grass] 02/04: Merge tag 'debian/2.1.2-5' into experimental

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository gdal-grass.

commit b27fd996ea64576b2c05df273128118d8d480fd2
Merge: 3e81a61 1d56cec
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Apr 3 01:20:59 2017 +0200

    Merge tag 'debian/2.1.2-5' into experimental
    
    Conflicts:
    	debian/changelog

 debian/changelog | 7 +++++++
 debian/rules     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 8b0be7c,82abc09..f052e55
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,9 +1,35 @@@
 +libgdal-grass (2.1.3-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release.
++  * Merge changes from libgdal-grass (2.1.2-5).
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 27 Jan 2017 13:12:12 +0100
 +
 +libgdal-grass (2.1.3~rc1-1~exp3) experimental; urgency=medium
 +
 +  * Add Breaks/Replaces for old version specific binary packages.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 26 Jan 2017 21:11:06 +0100
 +
 +libgdal-grass (2.1.3~rc1-1~exp2) experimental; urgency=medium
 +
 +  * Rename library package to libgdal-grass, drop now obsolete metapackage.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 21 Jan 2017 12:20:20 +0100
 +
 +libgdal-grass (2.1.3~rc1-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release candidate.
 +  * Drop grass72.patch, applied upstream. Refresh remaining patch.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 20 Jan 2017 11:41:22 +0100
 +
+ libgdal-grass (2.1.2-5) unstable; urgency=medium
+ 
+   * Enable PIE hardening flags.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 02 Apr 2017 23:43:22 +0200
+ 
  libgdal-grass (2.1.2-4) unstable; urgency=medium
  
    * Add patch to link GRASS 7.2 libraries.

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