[pyosmium] 01/02: Merge tag 'debian/2.5.4-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 47cbad314ed8756cfb046dfdc07ba52534cdc358
Merge: b09be22 35d169b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 11 12:18:03 2015 +0100

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

 CHANGELOG.md               | 19 ++++++++++++++-
 README.md                  | 11 +++++----
 debian/changelog           | 21 +++++++++++++++++
 debian/control             |  4 ++--
 doc/conf.py                |  4 ++--
 examples/amenity_list.py   |  2 +-
 examples/osm_diff_stats.py | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 examples/osm_file_stats.py |  2 +-
 examples/pub_names.py      |  2 +-
 examples/road_length.py    |  2 +-
 lib/geom.cc                |  2 +-
 setup.py                   |  2 +-
 test/test_io.py            |  8 +++----
 test/test_osm.py           |  2 +-
 14 files changed, 118 insertions(+), 21 deletions(-)

diff --cc debian/changelog
index bc4b628,4d70043..5338314
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,30 @@@
+ pyosmium (2.5.4-1) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 05 Dec 2015 14:22:05 +0100
+ 
+ pyosmium (2.5.4-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump minimum required libosmium2-dev to 2.5.4.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 03 Dec 2015 22:04:35 +0100
+ 
+ pyosmium (2.5.3-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump minimum required libosmium2-dev to 2.5.3.
+   * Update Vcs-Browser URL to use HTTPS.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Nov 2015 23:10:05 +0100
+ 
 +pyosmium (2.4.1-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 08 Sep 2015 08:33:33 +0200
 +
  pyosmium (2.4.1-2) unstable; urgency=medium
  
    * Don't ignore test failures, fixed upstream.
diff --cc debian/control
index 01e9c9b,1d8a8da..ea2b6f8
--- a/debian/control
+++ b/debian/control
@@@ -22,8 -22,8 +22,8 @@@ Build-Depends: debhelper (>= 9)
                 python3-sphinx,
                 zlib1g-dev
  Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/pyosmium.git/
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/pyosmium.git/
 -Vcs-Git: git://anonscm.debian.org/pkg-grass/pyosmium.git
 +Vcs-Git: git://anonscm.debian.org/pkg-grass/pyosmium.git -b jessie-backports
  Homepage: http://osmcode.org/pyosmium/
  
  Package: python-pyosmium

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