[python-osmapi] 01/02: Merge tag 'debian/0.6.2-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 f273d888986a2eacfeed9d988d02924c25f3a0ad
Merge: 658daeb 18d4dde
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 11 19:11:21 2016 +0100

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

 .travis.yml              | 12 ++-------
 CHANGELOG.md             |  9 +++++++
 README.md                | 69 +++++++++++++++++++++++++-----------------------
 debian/changelog         |  7 +++++
 debian/control           |  2 +-
 debian/copyright         |  2 +-
 debian/watch             |  5 ++--
 divshot.json             |  7 -----
 osmapi/__init__.py       |  2 +-
 test-requirements.txt    |  1 +
 tests/changeset_tests.py | 18 ++++++-------
 11 files changed, 70 insertions(+), 64 deletions(-)

diff --cc debian/changelog
index 40ea6c2,1681702..f4c1e07
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ python-osmapi (0.6.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update Homepage URL to use HTTPS.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 06 Jan 2016 07:35:51 +0100
+ 
 +python-osmapi (0.6.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 05 Jun 2015 15:00:22 +0200
 +
  python-osmapi (0.6.0-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index dc5362a,89d6d00..7b3153c
--- a/debian/control
+++ b/debian/control
@@@ -20,8 -20,8 +20,8 @@@ Build-Depends: debhelper (>= 9)
                 python-xmltodict
  Standards-Version: 3.9.6
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/python-osmapi.git
 -Vcs-Git: git://anonscm.debian.org/pkg-grass/python-osmapi.git
 +Vcs-Git: git://anonscm.debian.org/pkg-grass/python-osmapi.git -b jessie-backports
- Homepage: http://wiki.openstreetmap.org/wiki/Osmapi
+ Homepage: https://wiki.openstreetmap.org/wiki/Osmapi
  
  Package: python-osmapi
  Architecture: all

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