[pyosmium] 01/02: Merge tag 'debian/2.2.0-1' 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 c42c716a8234f94310692fc17018b8cbcccc0422
Merge: 84bfef3 399db68
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 10 21:49:00 2015 +0200

    Merge tag 'debian/2.2.0-1' into jessie-backports
    
    Conflicts:
    	debian/changelog

 CHANGELOG.md                              | 27 +++++++++++++++++++++++++++
 README.md                                 |  2 +-
 debian/changelog                          |  8 ++++++++
 debian/control                            |  2 +-
 debian/python-pyosmium.lintian-overrides  |  1 +
 debian/python3-pyosmium.lintian-overrides |  1 +
 debian/rules                              |  2 +-
 debian/watch                              |  2 +-
 doc/conf.py                               |  4 ++--
 setup.py                                  |  2 +-
 test/test_io.py                           |  2 +-
 11 files changed, 45 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index 190c382,1570e08..ccc5bd2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
+ pyosmium (2.2.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Handle other extensions in filenamemangle.
+   * Require at least libosmium version 2.2.0.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 04 Jul 2015 17:11:47 +0200
+ 
 +pyosmium (2.1.0-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf and Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 03 Jul 2015 19:25:06 +0200
 +
  pyosmium (2.1.0-2) unstable; urgency=medium
  
    * Ignore test failures instead of failing the entire build.

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