This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository libosmium.
commit 8e3d101ad0e7016f549902e48c525cb5fbf18e13 Merge: 1e111fb 7826371 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Sep 21 09:30:45 2016 +0200 Merge tag 'debian/2.9.0-1' into jessie-backports Conflicts: debian/changelog .gitignore | 2 + .ycm_extra_conf.py | 5 + CHANGELOG.md | 36 +- CMakeLists.txt | 2 +- CONTRIBUTING.md | 147 +-- CONTRIBUTING.md => NOTES_FOR_DEVELOPERS.md | 12 +- appveyor.yml | 83 +- benchmarks/osmium_benchmark_count.cpp | 8 +- benchmarks/osmium_benchmark_count_tag.cpp | 8 +- benchmarks/osmium_benchmark_index_map.cpp | 16 +- .../osmium_benchmark_static_vs_dynamic_index.cpp | 58 +- benchmarks/osmium_benchmark_write_pbf.cpp | 17 +- build-appveyor.bat | 123 +++ build-local.bat | 43 + cmake/iwyu.sh | 5 + debian/changelog | 8 + debian/libosmium2-dev.docs | 1 + debian/rules | 6 + examples/CMakeLists.txt | 8 +- examples/README.md | 32 + examples/osmium_area_test.cpp | 131 ++- examples/osmium_convert.cpp | 92 +- examples/osmium_count.cpp | 69 +- examples/osmium_create_node_cache.cpp | 55 - examples/osmium_debug.cpp | 46 +- examples/osmium_filter_discussions.cpp | 48 +- examples/osmium_index.cpp | 22 +- examples/osmium_location_cache_create.cpp | 87 ++ examples/osmium_location_cache_use.cpp | 101 ++ examples/osmium_pub_names.cpp | 89 ++ examples/osmium_read.cpp | 26 +- examples/osmium_read_with_progress.cpp | 56 + examples/osmium_road_length.cpp | 92 ++ examples/osmium_serdump.cpp | 24 +- examples/osmium_tiles.cpp | 72 ++ examples/osmium_use_node_cache.cpp | 68 -- include/osmium/area/assembler.hpp | 46 +- include/osmium/area/detail/node_ref_segment.hpp | 17 +- include/osmium/area/detail/proto_ring.hpp | 5 +- include/osmium/area/detail/segment_list.hpp | 23 +- include/osmium/area/detail/vector.hpp | 1 + include/osmium/area/multipolygon_collector.hpp | 7 +- include/osmium/area/problem_reporter.hpp | 2 + include/osmium/area/problem_reporter_exception.hpp | 1 + include/osmium/area/problem_reporter_ogr.hpp | 8 +- include/osmium/builder/attr.hpp | 37 +- include/osmium/builder/builder.hpp | 3 +- include/osmium/builder/builder_helper.hpp | 8 +- include/osmium/builder/osm_object_builder.hpp | 10 +- include/osmium/diff_iterator.hpp | 2 + include/osmium/dynamic_handler.hpp | 7 +- include/osmium/experimental/flex_reader.hpp | 3 +- include/osmium/geom/factory.hpp | 8 +- include/osmium/geom/geojson.hpp | 1 + include/osmium/geom/geos.hpp | 32 +- include/osmium/geom/haversine.hpp | 2 +- include/osmium/geom/ogr.hpp | 2 +- include/osmium/geom/projection.hpp | 22 +- include/osmium/geom/rapid_geojson.hpp | 2 + include/osmium/geom/tile.hpp | 45 +- include/osmium/geom/util.hpp | 4 +- include/osmium/geom/wkb.hpp | 8 +- include/osmium/geom/wkt.hpp | 3 - include/osmium/handler.hpp | 56 +- include/osmium/handler/check_order.hpp | 4 +- include/osmium/handler/node_locations_for_ways.hpp | 2 +- include/osmium/index/detail/create_map_with_fd.hpp | 4 +- include/osmium/index/detail/mmap_vector_file.hpp | 4 +- include/osmium/index/detail/vector_map.hpp | 2 +- include/osmium/index/detail/vector_multimap.hpp | 2 +- include/osmium/index/index.hpp | 4 +- include/osmium/index/map.hpp | 2 +- include/osmium/index/map/sparse_mem_map.hpp | 1 - include/osmium/io/any_input.hpp | 3 +- include/osmium/io/bzip2_compression.hpp | 10 +- include/osmium/io/compression.hpp | 31 +- include/osmium/io/detail/debug_output_format.hpp | 119 ++- include/osmium/io/detail/input_format.hpp | 2 +- include/osmium/io/detail/o5m_input_format.hpp | 13 +- include/osmium/io/detail/opl_input_format.hpp | 156 +++ include/osmium/io/detail/opl_output_format.hpp | 25 +- include/osmium/io/detail/opl_parser_functions.hpp | 747 ++++++++++++++ include/osmium/io/detail/output_format.hpp | 4 +- include/osmium/io/detail/pbf_decoder.hpp | 36 +- include/osmium/io/detail/pbf_input_format.hpp | 15 +- include/osmium/io/detail/pbf_output_format.hpp | 14 +- include/osmium/io/detail/read_write.hpp | 7 +- include/osmium/io/detail/string_table.hpp | 9 +- include/osmium/io/detail/string_util.hpp | 27 +- include/osmium/io/detail/write_thread.hpp | 1 + include/osmium/io/detail/xml_input_format.hpp | 11 +- include/osmium/io/detail/xml_output_format.hpp | 11 +- include/osmium/io/detail/zlib.hpp | 6 +- include/osmium/io/file.hpp | 6 +- include/osmium/io/gzip_compression.hpp | 12 +- include/osmium/io/input_iterator.hpp | 1 - include/osmium/{version.hpp => io/opl_input.hpp} | 18 +- include/osmium/io/output_iterator.hpp | 3 - include/osmium/io/overwrite.hpp | 2 +- include/osmium/io/reader.hpp | 43 +- include/osmium/io/writer.hpp | 12 +- include/osmium/memory/item.hpp | 34 +- include/osmium/memory/item_iterator.hpp | 15 +- include/osmium/object_pointer_collection.hpp | 2 - include/osmium/{tags/taglist.hpp => opl.hpp} | 50 +- include/osmium/osm.hpp | 15 +- include/osmium/osm/area.hpp | 2 + include/osmium/osm/box.hpp | 1 - include/osmium/osm/changeset.hpp | 7 + include/osmium/osm/crc.hpp | 28 +- include/osmium/osm/diff_object.hpp | 5 +- include/osmium/osm/location.hpp | 156 +-- include/osmium/osm/node_ref_list.hpp | 3 +- include/osmium/osm/object.hpp | 23 +- include/osmium/osm/object_comparisons.hpp | 3 + include/osmium/osm/relation.hpp | 2 +- include/osmium/osm/segment.hpp | 1 - include/osmium/osm/tag.hpp | 1 - include/osmium/osm/timestamp.hpp | 83 +- include/osmium/osm/types_from_string.hpp | 3 +- include/osmium/osm/way.hpp | 5 +- include/osmium/relations/collector.hpp | 14 +- include/osmium/relations/detail/member_meta.hpp | 2 - include/osmium/tags/filter.hpp | 1 + include/osmium/tags/taglist.hpp | 2 +- include/osmium/thread/pool.hpp | 4 +- include/osmium/thread/queue.hpp | 4 +- include/osmium/thread/util.hpp | 2 + include/osmium/util/delta.hpp | 3 +- include/osmium/util/double.hpp | 3 +- include/osmium/util/file.hpp | 82 +- include/osmium/util/iterator.hpp | 3 +- include/osmium/util/memory_mapping.hpp | 9 +- include/osmium/util/options.hpp | 9 +- include/osmium/util/progress_bar.hpp | 179 ++++ include/osmium/util/string.hpp | 2 +- include/osmium/util/verbose_output.hpp | 8 +- include/osmium/version.hpp | 4 +- include/protozero/iterators.hpp | 10 +- include/protozero/pbf_writer.hpp | 8 +- include/protozero/version.hpp | 4 +- osmium.imp | 9 +- test/CMakeLists.txt | 2 + test/data-tests/include/common.hpp | 6 +- test/data-tests/testdata-multipolygon.cpp | 56 +- test/data-tests/testdata-overview.cpp | 23 +- test/data-tests/testdata-testcases.cpp | 6 +- test/data-tests/testdata-xml.cpp | 90 +- test/t/basic/test_area.cpp | 78 ++ test/t/basic/test_location.cpp | 93 +- test/t/basic/test_node.cpp | 68 +- test/t/basic/test_timestamp.cpp | 44 + test/t/geom/test_tile.cpp | 140 +-- test/t/geom/test_wkb.cpp | 167 +-- test/t/geom/test_wkt.cpp | 188 ++-- test/t/index/test_id_to_location.cpp | 26 +- test/t/io/test_opl_parser.cpp | 1075 ++++++++++++++++++++ test/t/io/test_reader_with_mock_decompression.cpp | 10 +- test/t/io/test_reader_with_mock_parser.cpp | 6 +- test/t/io/test_writer_with_mock_compression.cpp | 2 +- test/t/tags/test_filter.cpp | 6 +- test/t/util/test_cast_with_assert.cpp | 2 +- 162 files changed, 4953 insertions(+), 1368 deletions(-) diff --cc debian/changelog index ee8f698,4300663..12180aa --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,11 +1,17 @@@ + libosmium (2.9.0-1) unstable; urgency=medium + + * New upstream release. + * Include NOTES_FOR_DEVELOPERS.md in docs. + * Override dh_installexamples to remove executable bit from .cpp files. + + -- Bas Couwenberg <sebas...@debian.org> Thu, 15 Sep 2016 15:28:39 +0200 + +libosmium (2.8.0-2~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <sebas...@debian.org> Wed, 10 Aug 2016 19:50:44 +0200 + libosmium (2.8.0-2) unstable; urgency=medium * Ignore test failures on arm64 & ppc64el. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel