[osmium-tool] 01/02: Merge tag 'debian/1.3.1-2' into jessie-backports

[Bas Couwenberg]

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

sebastic pushed a commit to branch jessie-backports
in repository osmium-tool.

commit 80f7e8aac5f5f7d642f9f9c15d27f325930c232a
Merge: 3d9bfb9 4821faf
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 14 12:07:03 2016 +0200

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

 debian/changelog                 | 6 ++++++
 debian/control                   | 2 +-
 debian/patches/output-typo.patch | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index fe110c1,3ca80a3..e49c83f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ osmium-tool (1.3.1-2) unstable; urgency=medium
+ 
+   * Rebuild with libosmium 2.8.0, for long strings overflow fix.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 08 Aug 2016 15:54:59 +0200
+ 
 +osmium-tool (1.3.1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 14 Jun 2016 19:34:12 +0200
 +
  osmium-tool (1.3.1-1) unstable; urgency=medium
  
    * New upstream release.

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