[pyosmium] 01/02: Merge tag 'debian/2.12.4-1' into stretch-backports

[Bas Couwenberg]

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

sebastic pushed a commit to branch stretch-backports
in repository pyosmium.

commit 7952327b68498f5b3e4381cf80eda64d7e78ead7
Merge: 873e167 21afb3f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 31 10:51:11 2017 +0200

    Merge tag 'debian/2.12.4-1' into stretch-backports

 CHANGELOG.md          | 11 +++++++++++
 debian/changelog      |  6 ++++++
 doc/intro.rst         |  9 ++++++---
 lib/osmium.cc         |  1 +
 src/osmium/version.py |  2 +-
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 11c3eef,63936d2..3d7bc06
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ pyosmium (2.12.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 20 Aug 2017 00:35:31 +0200
+ 
 +pyosmium (2.12.3-2~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 02 Jul 2017 12:53:18 +0200
 +
  pyosmium (2.12.3-2) unstable; urgency=medium
  
    * Bump Standards-Version to 4.0.0, no changes.

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