diff -Nru pyosmium-2.10.2/CHANGELOG.md pyosmium-2.11.0/CHANGELOG.md --- pyosmium-2.10.2/CHANGELOG.md 2016-11-16 10:38:33.000000000 +0000 +++ pyosmium-2.11.0/CHANGELOG.md 2017-01-15 14:39:17.000000000 +0000 @@ -13,13 +13,20 @@ ### Fixed +## [2.11.0] - 2017-01-15 + +### Changed + +- Use current libosmium + + ## [2.10.2] - 2016-11-16 ### Added - support for sdist creation (now published via Pypi) - custom locations for libosmium and boost can be set via the - environment variables LIBOSMIUM_PREFIX and BOOST_PREFIX. + environment variables `LIBOSMIUM_PREFIX` and `BOOST_PREFIX`. - export bounding box from osmium::io::Header ### Changed @@ -116,7 +123,9 @@ - Exception not caught in test. -[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.9.0...HEAD +[unreleased]: https://github.com/osmcode/pyosmium/compare/v2.11.0...HEAD +[2.11.0]: https://github.com/osmcode/pyosmium/compare/v2.10.2...v2.11.0 +[2.10.2]: https://github.com/osmcode/pyosmium/compare/v2.9.0...v2.10.2 [2.9.0]: https://github.com/osmcode/pyosmium/compare/v2.8.0...v2.9.0 [2.8.0]: https://github.com/osmcode/pyosmium/compare/v2.7.1...v2.8.0 [2.7.1]: https://github.com/osmcode/pyosmium/compare/v2.6.0...v2.7.1 diff -Nru pyosmium-2.10.2/debian/changelog pyosmium-2.11.0/debian/changelog --- pyosmium-2.10.2/debian/changelog 2016-11-21 10:29:13.000000000 +0000 +++ pyosmium-2.11.0/debian/changelog 2017-01-17 17:45:04.000000000 +0000 @@ -1,3 +1,24 @@ +pyosmium (2.11.0-1) unstable; urgency=medium + + * Move from experimental to unstable. + + -- Bas Couwenberg Tue, 17 Jan 2017 18:45:04 +0100 + +pyosmium (2.11.0-1~exp1) experimental; urgency=medium + + * New upstream release. + * Drop patches, included upstream. + * Update copyright years for Sarah Hoffmann. + * Bump minimum required libosmium2-dev to 2.11.0. + + -- Bas Couwenberg Sun, 15 Jan 2017 21:47:38 +0100 + +pyosmium (2.10.2-2~exp1) experimental; urgency=medium + + * Add upstream patch to fix FTBFS with libosmium 2.11.0. + + -- Bas Couwenberg Sun, 15 Jan 2017 13:41:56 +0100 + pyosmium (2.10.2-1) unstable; urgency=medium * Move from experimental to unstable. diff -Nru pyosmium-2.10.2/debian/control pyosmium-2.11.0/debian/control --- pyosmium-2.10.2/debian/control 2016-11-16 17:49:17.000000000 +0000 +++ pyosmium-2.11.0/debian/control 2017-01-15 20:46:51.000000000 +0000 @@ -11,7 +11,7 @@ libexpat1-dev, libgdal-dev, libgeos++-dev, - libosmium2-dev (>= 2.10.2), + libosmium2-dev (>= 2.11.0), libsparsehash-dev, python-all-dev, python-setuptools, diff -Nru pyosmium-2.10.2/debian/copyright pyosmium-2.11.0/debian/copyright --- pyosmium-2.10.2/debian/copyright 2016-10-26 19:36:51.000000000 +0000 +++ pyosmium-2.11.0/debian/copyright 2017-01-15 20:46:59.000000000 +0000 @@ -4,7 +4,7 @@ Source: https://github.com/osmcode/pyosmium Files: * -Copyright: 2014-2016, Sarah Hoffmann +Copyright: 2014-2017, Sarah Hoffmann License: BSD-2-Clause Files: debian/* diff -Nru pyosmium-2.10.2/doc/conf.py pyosmium-2.11.0/doc/conf.py --- pyosmium-2.10.2/doc/conf.py 2016-11-16 10:38:33.000000000 +0000 +++ pyosmium-2.11.0/doc/conf.py 2017-01-15 14:39:17.000000000 +0000 @@ -65,7 +65,7 @@ # General information about the project. project = 'Pyosmium' -copyright = '2015-2016, Sarah Hoffmann' +copyright = '2015-2017, Sarah Hoffmann' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff -Nru pyosmium-2.10.2/doc/ref_geom.rst pyosmium-2.11.0/doc/ref_geom.rst --- pyosmium-2.10.2/doc/ref_geom.rst 2016-11-16 10:38:33.000000000 +0000 +++ pyosmium-2.11.0/doc/ref_geom.rst 2017-01-15 14:39:17.000000000 +0000 @@ -2,6 +2,7 @@ ------------------------------------ This module provides various helper functions for geometry handling. +Note: remember to apply a location handler before in order to use these geometry utilities on node locations. Geometry Factories ^^^^^^^^^^^^^^^^^^ diff -Nru pyosmium-2.10.2/lib/osm.cc pyosmium-2.11.0/lib/osm.cc --- pyosmium-2.10.2/lib/osm.cc 2016-11-16 10:38:33.000000000 +0000 +++ pyosmium-2.11.0/lib/osm.cc 2017-01-15 14:39:17.000000000 +0000 @@ -170,7 +170,8 @@ "is normally not used directly, use one of its subclasses instead.", no_init) .def("__len__", &osmium::NodeRefList::size) - .def("__getitem__", &osmium::NodeRefList::operator[], return_value_policy()) + .def("__getitem__", + make_function(static_cast(&osmium::NodeRefList::operator[]), return_value_policy())) .def("__iter__", iterator>()) .def("is_closed", &osmium::NodeRefList::is_closed, args("self"), "True if the start and end node are the same (synonym for " diff -Nru pyosmium-2.10.2/osmium/version.py pyosmium-2.11.0/osmium/version.py --- pyosmium-2.10.2/osmium/version.py 2016-11-16 10:38:33.000000000 +0000 +++ pyosmium-2.11.0/osmium/version.py 2017-01-15 14:39:17.000000000 +0000 @@ -3,9 +3,9 @@ """ # the major version -pyosmium_major = '2.10' +pyosmium_major = '2.11' # current release (Pip version) -pyosmium_release = '2.10.2' +pyosmium_release = '2.11.0' # libosmium version shipped with the Pip release -libosmium_version = '2.10.2' +libosmium_version = '2.11.0'