[pyosmium] 01/04: New upstream version 2.12.4

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pyosmium.

commit c4ba750981c6d82b2a7c8108cc4882a72f5259c7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 20 00:34:24 2017 +0200

    New upstream version 2.12.4
---
 CHANGELOG.md          | 11 +++++++++++
 doc/intro.rst         |  9 ++++++---
 lib/osmium.cc         |  1 +
 src/osmium/version.py |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5833572..4467604 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [2.12.4] - 2017-08-19
+
+### Added
+
+### Changed
+
+### Fixed
+
+- make apply_reader_simple a template again
+- minor fised to documentation
+
 ## [2.12.3] - 2017-05-25
 
 ### Added
diff --git a/doc/intro.rst b/doc/intro.rst
index 13dd236..b2f1e62 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -9,7 +9,7 @@ For a more detailed introduction into the design of the osmium library, the
 reader is referred to the `osmium documentation`_.
 
 .. _OSM data model: http://wiki.openstreetmap.org/wiki/Elements
-.. _osmium documentation: http://osmcode.org/libosmium/manual/libosmium-manual.html
+.. _osmium documentation: http://osmcode.org/osmium-concepts/
 
 Reading OSM Data
 ----------------
@@ -115,9 +115,12 @@ If you want the cache to be persistent across invocations, you
 can use `dense_file_array` giving an additional file location for the
 cache like that::
 
-    h.apply_file("test.osm.pbf", locations=True, idx='sparse_file_array,example.nodecache')
+    h.apply_file("test.osm.pbf", locations=True, idx='dense_file_array,example.nodecache')
 
-where `example.nodecache` is the name of the cache file.
+where `example.nodecache` is the name of the cache file. For more details
+on the different kind of indexes, see the `Index section in the Osmium Manual`_.
+
+.. _Index section in the Osmium Manual: http://osmcode.org/osmium-concepts/#indexes
 
 Interfacing with Shapely
 ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/lib/osmium.cc b/lib/osmium.cc
index e351bf4..62d787f 100644
--- a/lib/osmium.cc
+++ b/lib/osmium.cc
@@ -28,6 +28,7 @@ void apply_reader_simple(osmium::io::Reader &rd, T &h) {
     osmium::apply(rd, h);
 }
 
+template <>
 void apply_reader_simple(osmium::io::Reader &rd, BaseHandler &h) {
     h.apply_start();
     osmium::apply(rd, h);
diff --git a/src/osmium/version.py b/src/osmium/version.py
index 73f77fd..9b0bd33 100644
--- a/src/osmium/version.py
+++ b/src/osmium/version.py
@@ -5,7 +5,7 @@ Version information.
 # the major version
 pyosmium_major = '2.12'
 # current release (Pip version)
-pyosmium_release = '2.12.3'
+pyosmium_release = '2.12.4'
 
 # libosmium version shipped with the Pip release
 libosmium_version = '2.12.2'

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