[python-osmapi] 01/02: Merge tag 'debian/0.8.1-1' 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 python-osmapi.

commit 28a513a891f9a3449f572efa6c566925fdd5c451
Merge: 75195a9 55a5ead
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 1 18:00:49 2017 +0100

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

 .travis.yml              |  1 -
 CHANGELOG.md             | 15 +++++++++++++++
 build.sh                 |  4 ++++
 debian/changelog         | 13 +++++++++++++
 debian/control           | 10 ++++++----
 osmapi/__init__.py       |  2 +-
 setup.py                 | 16 +++++++++++-----
 test-requirements.txt    |  1 +
 tests/changeset_tests.py | 18 +++++++++---------
 9 files changed, 60 insertions(+), 20 deletions(-)

diff --cc debian/changelog
index 71d0517,5622af0..079ab55
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ python-osmapi (0.8.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 22 Dec 2016 07:18:47 +0100
+ 
+ python-osmapi (0.7.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Add python{,3}-requests to dependencies.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 21 Dec 2016 18:18:02 +0100
+ 
 +python-osmapi (0.7.1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 21 Dec 2016 18:35:14 +0100
 +
  python-osmapi (0.7.1-1) unstable; urgency=medium
  
    * New upstream release.

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