[pyosmium] 01/02: Merge tag 'debian/2.4.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 pyosmium.

commit 43ea2adf3f5d9bbf814d31b0ef77ec3b5f3b9b46
Merge: bbc0255 2aaf0b6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 8 08:33:27 2015 +0200

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

 .travis.yml      | 69 ++++++++++++++++++++++++++++++++------------------------
 CHANGELOG.md     | 19 +++++++++++++++-
 debian/changelog | 21 +++++++++++++++++
 debian/control   |  5 +---
 debian/rules     |  2 +-
 doc/conf.py      |  4 ++--
 setup.py         |  4 ++--
 7 files changed, 85 insertions(+), 39 deletions(-)

diff --cc debian/changelog
index 36931ed,c6e3be4..ae43e89
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,30 @@@
+ pyosmium (2.4.1-2) unstable; urgency=medium
+ 
+   * Don't ignore test failures, fixed upstream.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 02 Sep 2015 17:04:03 +0200
+ 
+ pyosmium (2.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bump minimum required libosmium2-dev to 2.4.1.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 31 Aug 2015 16:38:11 +0200
+ 
+ pyosmium (2.3.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop build dependencies on osmpbf & protobuf.
+   * Bump minimum required libosmium2-dev to 2.3.0.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 21 Aug 2015 21:18:37 +0200
+ 
 +pyosmium (2.2.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 10 Jul 2015 21:49:04 +0200
 +
  pyosmium (2.2.0-1) unstable; urgency=medium
  
    * New upstream release.

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