[pyosmium] 01/05: Imported Upstream version 2.5.4

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pyosmium.

commit a98be7a6b80c57cb997aa8b10b7f4571d8db8cbc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 3 22:01:46 2015 +0100

    Imported Upstream version 2.5.4
---
 CHANGELOG.md | 11 ++++++++++-
 README.md    |  8 +++-----
 doc/conf.py  |  2 +-
 setup.py     |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9188283..b38f524 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 
+## [2.5.4] - 2015-12-03
+
+### Changed
+
+- Use current libosmium
+- README updates
+
+
 ## [2.5.3] - 2015-11-17
 
 ### Changed
@@ -44,7 +52,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Exception not caught in test.
 
-[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.5.3...HEAD
+[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.5.4...HEAD
+[2.5.4]: https://github.com/osmcode/pyosmium/compare/v2.4.3...v2.5.4
 [2.5.3]: https://github.com/osmcode/pyosmium/compare/v2.4.1...v2.5.3
 [2.4.1]: https://github.com/osmcode/pyosmium/compare/v2.3.0...v2.4.1
 [2.3.0]: https://github.com/osmcode/pyosmium/compare/v2.2.0...v2.3.0
diff --git a/README.md b/README.md
index 11fa29a..9b5187c 100644
--- a/README.md
+++ b/README.md
@@ -12,11 +12,13 @@ manner.
 Python >= 2.7 is supported (that includes python 3.x).
 
 pyosmium uses [Boost.Python](http://www.boost.org/doc/libs/1_56_0/libs/python/doc/index.html)
-to create the bindings. On Debian/Ubuntu install `libboost-python-dev`.
+to create the bindings. On Debian/Ubuntu install `libboost-python-dev`. OS X run `brew install boost-python` or `brew install boost-python --with-python3` depending on which python version you want to use – You can also (re)install both.
 
 You have to compile with the same compiler version python is compiled with on
 your system, otherwise it might not work.
 
+Libosmium is expected to reside in the same directory as pyosmium or to be
+installed globally.
 
 ## Installation
 
@@ -28,10 +30,6 @@ To compile and install the bindings, run
 
     python setup.py install
 
-Libosmium is expected to reside in the same directory as pyosmium or to be
-installed globally.
-
-
 ## Examples
 
 The `example` directory contains small examples on how to use the library.
diff --git a/doc/conf.py b/doc/conf.py
index 31ad351..368f03c 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -65,7 +65,7 @@ copyright = '2015, Sarah Hoffmann'
 # The short X.Y version.
 version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.5.3'
+release = '2.5.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index cd8ec12..913e495 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ for ext in ('io', 'osm', 'index', 'geom'):
 
 
 setup (name = 'pyosmium',
-       version = '2.5.3',
+       version = '2.5.4',
        description = 'Provides python bindings for libosmium.',
        packages = packages,
        ext_modules = extensions)

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