[mapnik] 01/04: Merge tag 'debian/3.0.12+ds-3'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapnik.

commit 425cc93e02a4bdd13ac5f51427b4178095b58ab9
Merge: 19e8623 5bedc21
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Apr 3 15:32:31 2017 +0200

    Merge tag 'debian/3.0.12+ds-3'
    
    Conflicts:
    	debian/changelog

 debian/changelog | 8 ++++++++
 debian/rules     | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index d528b8b,abd49a5..e77d4bf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,11 +1,32 @@@
 +mapnik (3.0.13+ds-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 08 Feb 2017 18:21:29 +0100
 +
 +mapnik (3.0.13~rc2+ds-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release candidate.
 +  * Require at least mapbox-variant 1.1.5.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 06 Feb 2017 18:57:41 +0100
 +
 +mapnik (3.0.13~rc1+ds-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release candidate.
 +  * Re-instate lintian override for hardening-no-pie.
 +  * Drop dependencies-typo.patch, applied upstream.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 19 Jan 2017 00:11:00 +0100
 +
+ mapnik (3.0.12+ds-3) unstable; urgency=medium
+ 
+   * Update branch in gbp.conf & Vcs-Git URL.
+   * Enable PIE hardening buildflags.
+     (closes: #859424)
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 03 Apr 2017 14:47:38 +0200
+ 
  mapnik (3.0.12+ds-2) unstable; urgency=medium
  
    * Add patch to fix 'dependencies' typo.

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