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

commit 9e207a2f6193b0602d7fd1b2a4b3698d2dbd572f
Merge: f0951cd bfef530
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 5 15:00:15 2015 +0200

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

 .travis.yml                     |   1 +
 CHANGELOG.md                    |  11 ++
 CONTRIBUTING.md                 |  55 +++++++++
 debian/changelog                |   7 ++
 debian/docs                     |   1 +
 osmapi/OsmApi.py                | 245 ++++++++++++++++++++++++++++++++++++----
 osmapi/__init__.py              |   2 +-
 requirements.txt                |   1 +
 setup.py                        |   2 +-
 tests/changeset_tests.py        |  30 ++---
 tests/fixtures/passwordfile.txt |   1 +
 tests/helper_tests.py           |  18 +++
 tests/node_tests.py             |  53 ++++++++-
 tests/relation_tests.py         |  32 ++++++
 tests/way_tests.py              |  22 ++++
 tox.ini                         |   2 +-
 16 files changed, 437 insertions(+), 46 deletions(-)

diff --cc debian/changelog
index f856e19,42365ed..a809843
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
+ python-osmapi (0.6.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Install CONTRIBUTING.md in documentation.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 30 May 2015 16:56:13 +0200
+ 
 +python-osmapi (0.5.0-1~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, 08 May 2015 14:46:02 +0200
 +
  python-osmapi (0.5.0-1) unstable; urgency=medium
  
    * Move from experimental to unstable.

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