[libosmium] 01/02: Merge tag 'debian/2.13.1-1' into stretch-backports
Bas Couwenberg
sebastic at debian.org
Thu Aug 31 09:43:21 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch stretch-backports
in repository libosmium.
commit 2ec91aa6e726089fd8c5dc5fafea6ce4fa7962e1
Merge: dad41eb a0a8bd4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Aug 31 10:44:44 2017 +0200
Merge tag 'debian/2.13.1-1' into stretch-backports
.codecov.yml | 7 +
.gitignore | 2 +
.travis.yml | 25 +-
CHANGELOG.md | 105 +-
CMakeLists.txt | 40 +-
NOTES_FOR_DEVELOPERS.md | 34 +-
README.md | 5 +-
appveyor.yml | 8 +
build-appveyor.bat | 6 +-
debian/changelog | 33 +
debian/control | 4 +-
debian/rules | 2 +-
examples/CMakeLists.txt | 4 +
examples/osmium_amenity_list.cpp | 44 +-
examples/osmium_area_test.cpp | 60 +-
examples/osmium_change_tags.cpp | 4 +-
examples/osmium_convert.cpp | 16 +-
examples/osmium_create_pois.cpp | 6 +-
examples/osmium_debug.cpp | 16 +-
examples/osmium_dump_internal.cpp | 13 +-
examples/osmium_index_lookup.cpp | 59 +-
examples/osmium_location_cache_create.cpp | 9 +-
examples/osmium_location_cache_use.cpp | 9 +-
examples/osmium_road_length.cpp | 6 +-
include/osmium/area/assembler.hpp | 230 +---
include/osmium/area/assembler_config.hpp | 8 +-
.../area/{assembler.hpp => assembler_legacy.hpp} | 84 +-
include/osmium/area/detail/basic_assembler.hpp | 135 ++-
.../area/detail/basic_assembler_with_tags.hpp | 93 ++
include/osmium/area/detail/node_ref_segment.hpp | 35 +-
include/osmium/area/detail/segment_list.hpp | 50 +-
include/osmium/area/geom_assembler.hpp | 5 +-
include/osmium/area/multipolygon_collector.hpp | 16 +-
...ygon_collector.hpp => multipolygon_manager.hpp} | 167 ++-
...llector.hpp => multipolygon_manager_legacy.hpp} | 148 +--
include/osmium/area/problem_reporter.hpp | 12 +
include/osmium/area/problem_reporter_exception.hpp | 6 +
include/osmium/area/problem_reporter_ogr.hpp | 4 +
include/osmium/area/problem_reporter_stream.hpp | 6 +
include/osmium/area/stats.hpp | 1 +
include/osmium/builder/builder.hpp | 16 +-
include/osmium/builder/osm_object_builder.hpp | 117 +-
include/osmium/diff_handler.hpp | 6 +-
include/osmium/diff_iterator.hpp | 6 +-
include/osmium/diff_visitor.hpp | 6 +-
include/osmium/dynamic_handler.hpp | 9 +-
include/osmium/experimental/flex_reader.hpp | 2 +-
include/osmium/geom/factory.hpp | 15 +-
include/osmium/geom/geos.hpp | 22 +-
include/osmium/geom/mercator_projection.hpp | 3 +
include/osmium/geom/projection.hpp | 3 +-
include/osmium/geom/relations.hpp | 12 +-
include/osmium/geom/tile.hpp | 26 +-
include/osmium/geom/wkb.hpp | 22 +-
include/osmium/handler/check_order.hpp | 23 +-
include/osmium/handler/disk_store.hpp | 4 +-
include/osmium/handler/dump.hpp | 4 +-
include/osmium/handler/node_locations_for_ways.hpp | 14 +-
include/osmium/index/detail/create_map_with_fd.hpp | 6 +-
include/osmium/index/detail/mmap_vector_file.hpp | 6 +-
include/osmium/index/detail/tmpfile.hpp | 2 +-
include/osmium/index/detail/vector_map.hpp | 15 +-
include/osmium/index/id_set.hpp | 53 +-
include/osmium/index/index.hpp | 3 +-
include/osmium/index/map.hpp | 9 +-
include/osmium/index/map/all.hpp | 1 +
include/osmium/index/map/flex_mem.hpp | 285 +++++
include/osmium/index/node_locations_map.hpp | 4 +
include/osmium/index/relations_map.hpp | 16 +-
include/osmium/io/bzip2_compression.hpp | 28 +-
include/osmium/io/compression.hpp | 49 +-
include/osmium/io/detail/debug_output_format.hpp | 17 +-
include/osmium/io/detail/input_format.hpp | 22 +-
include/osmium/io/detail/o5m_input_format.hpp | 8 +-
include/osmium/io/detail/opl_input_format.hpp | 105 +-
include/osmium/io/detail/opl_output_format.hpp | 15 +-
include/osmium/io/detail/opl_parser_functions.hpp | 23 +-
include/osmium/io/detail/output_format.hpp | 49 +-
include/osmium/io/detail/pbf_decoder.hpp | 94 +-
include/osmium/io/detail/pbf_input_format.hpp | 31 +-
include/osmium/io/detail/pbf_output_format.hpp | 54 +-
include/osmium/io/detail/read_write.hpp | 10 +-
include/osmium/io/detail/string_table.hpp | 16 +-
include/osmium/io/detail/string_util.hpp | 8 +-
include/osmium/io/detail/write_thread.hpp | 2 +-
include/osmium/io/detail/xml_input_format.hpp | 2 +-
include/osmium/io/detail/xml_output_format.hpp | 17 +-
include/osmium/io/detail/zlib.hpp | 4 +-
include/osmium/io/file.hpp | 35 +-
include/osmium/io/file_format.hpp | 17 +-
include/osmium/io/gzip_compression.hpp | 26 +-
include/osmium/io/header.hpp | 12 +-
include/osmium/io/reader.hpp | 44 +-
include/osmium/io/writer.hpp | 14 +-
include/osmium/memory/buffer.hpp | 91 +-
include/osmium/memory/callback_buffer.hpp | 189 +++
include/osmium/memory/item.hpp | 2 +-
include/osmium/object_pointer_collection.hpp | 10 +-
include/osmium/opl.hpp | 2 +-
include/osmium/osm/area.hpp | 4 +-
include/osmium/osm/changeset.hpp | 24 +-
include/osmium/osm/location.hpp | 36 +-
include/osmium/osm/object.hpp | 13 +-
include/osmium/osm/object_comparisons.hpp | 33 +-
include/osmium/osm/relation.hpp | 9 +-
include/osmium/osm/types.hpp | 7 +
include/osmium/osm/types_from_string.hpp | 16 +-
include/osmium/relations/collector.hpp | 7 +-
include/osmium/relations/manager_util.hpp | 197 ++++
include/osmium/relations/members_database.hpp | 406 +++++++
include/osmium/relations/relations_database.hpp | 335 ++++++
include/osmium/relations/relations_manager.hpp | 567 +++++++++
include/osmium/storage/item_stash.hpp | 342 ++++++
include/osmium/thread/function_wrapper.hpp | 3 +-
include/osmium/thread/pool.hpp | 37 +-
include/osmium/thread/queue.hpp | 9 +-
include/osmium/util/config.hpp | 5 +-
include/osmium/util/file.hpp | 72 +-
include/osmium/util/iterator.hpp | 21 +-
include/osmium/util/memory_mapping.hpp | 91 +-
include/osmium/util/options.hpp | 12 +-
include/osmium/util/progress_bar.hpp | 21 +-
include/osmium/util/string.hpp | 14 +-
include/osmium/util/verbose_output.hpp | 4 +-
include/osmium/version.hpp | 6 +-
include/protozero/pbf_builder.hpp | 18 +-
include/protozero/pbf_message.hpp | 4 +
include/protozero/pbf_reader.hpp | 8 +-
include/protozero/pbf_writer.hpp | 11 +
include/protozero/types.hpp | 8 +-
include/protozero/version.hpp | 4 +-
test/CMakeLists.txt | 16 +
test/data-tests/testdata-multipolygon.cpp | 6 +-
test/data-tests/testdata-xml.cpp | 4 +-
test/examples/CMakeLists.txt | 33 +-
test/examples/t/amenity_list/CMakeLists.txt | 10 +-
test/examples/t/amenity_list/area.osm | 18 +
test/examples/t/area_test/CMakeLists.txt | 25 +
test/examples/t/area_test/data.osm | 34 +
test/examples/t/change_tags/.gitattributes | 1 +
test/examples/t/change_tags/CMakeLists.txt | 9 +
test/examples/t/change_tags/data.osm | 20 +
test/examples/t/change_tags/result.osm | 16 +
test/examples/t/convert/CMakeLists.txt | 46 +
test/examples/t/convert/data.osm | 34 +
test/examples/t/count/CMakeLists.txt | 8 +
test/examples/t/count/data.osm | 12 +
test/examples/t/create_pois/CMakeLists.txt | 13 +
test/examples/t/debug/CMakeLists.txt | 55 +
test/examples/t/debug/changesets.osm | 7 +
test/examples/t/debug/data.osm | 13 +
test/examples/t/dump_internal/CMakeLists.txt | 36 +
test/examples/t/dump_internal/data.osm | 34 +
test/examples/t/filter_discussions/CMakeLists.txt | 10 +
test/examples/t/filter_discussions/changesets.osm | 11 +
test/examples/t/index_lookup/CMakeLists.txt | 46 +
test/examples/t/location_cache/CMakeLists.txt | 36 +
test/examples/t/location_cache/data.osm | 7 +
test/examples/t/location_cache/way.osm | 9 +
test/examples/t/pub_names/CMakeLists.txt | 22 +-
.../t/pub_names/{pubs.osm => pub-addr.osm} | 3 +
.../t/pub_names/{pubs.osm => pub-node.osm} | 0
.../t/pub_names/{pubs.osm => pub-noname.osm} | 1 -
test/examples/t/pub_names/pub-way.osm | 21 +
test/examples/t/read/CMakeLists.txt | 4 +
test/examples/t/read/data.osm | 29 +
test/examples/t/read_with_progress/CMakeLists.txt | 4 +
test/examples/t/read_with_progress/data.osm | 29 +
test/examples/t/tiles/CMakeLists.txt | 18 +
test/include/catch.hpp | 1222 +++++++++++++-------
test/t/area/test_node_ref_segment.cpp | 10 +-
test/t/geom/test_geojson.cpp | 20 +-
test/t/geom/test_geos.cpp | 2 +-
test/t/geom/test_mercator.cpp | 57 +-
test/t/geom/test_ogr.cpp | 2 +-
test/t/geom/test_projection.cpp | 4 +-
test/t/geom/test_tile.cpp | 28 +-
test/t/geom/test_wkb.cpp | 16 +-
test/t/geom/test_wkt.cpp | 36 +-
test/t/handler/test_check_order_handler.cpp | 128 ++
test/t/handler/test_dynamic_handler.cpp | 116 ++
test/t/index/test_file_based_index.cpp | 78 +-
test/t/index/test_id_to_location.cpp | 89 +-
test/t/io/data-cr.opl | 1 +
test/t/io/test_bzip2.cpp | 2 +-
test/t/io/test_compression_factory.cpp | 27 +-
test/t/io/test_file_formats.cpp | 122 +-
test/t/io/test_opl_parser.cpp | 186 ++-
test/t/io/test_output_iterator.cpp | 41 +-
test/t/io/test_reader.cpp | 21 +-
test/t/io/test_reader_fileformat.cpp | 2 +-
test/t/io/test_reader_with_mock_parser.cpp | 4 +-
test/t/io/test_string_table.cpp | 178 +--
test/t/io/test_writer.cpp | 45 +-
test/t/io/test_writer_with_mock_compression.cpp | 6 +-
test/t/io/test_writer_with_mock_encoder.cpp | 14 +-
test/t/memory/test_buffer_basics.cpp | 85 +-
test/t/memory/test_buffer_node.cpp | 2 +-
test/t/memory/test_callback_buffer.cpp | 101 ++
test/t/memory/test_item.cpp | 29 +
test/t/osm/test_area.cpp | 2 +-
test/t/osm/test_box.cpp | 228 ++--
test/t/osm/test_changeset.cpp | 2 +-
test/t/osm/test_crc.cpp | 92 +-
test/t/osm/test_location.cpp | 283 +++--
test/t/osm/test_node.cpp | 25 +-
test/t/osm/test_node_ref.cpp | 34 +-
test/t/osm/test_object_comparisons.cpp | 72 +-
test/t/osm/test_timestamp.cpp | 164 ++-
test/t/osm/test_types_from_string.cpp | 78 +-
test/t/osm/test_way.cpp | 4 +-
test/t/relations/data.osm | 32 +
test/t/relations/dupl_member.osm | 17 +
test/t/relations/test_members_database.cpp | 194 ++++
test/t/relations/test_read_relations.cpp | 77 ++
test/t/relations/test_relations_database.cpp | 105 ++
test/t/relations/test_relations_manager.cpp | 248 ++++
test/t/storage/test_item_stash.cpp | 167 +++
test/t/tags/test_filter.cpp | 22 +-
test/t/tags/test_operators.cpp | 93 +-
test/t/thread/test_pool.cpp | 60 +-
test/t/thread/test_util.cpp | 37 +
test/t/util/.gitattributes | 1 +
test/t/util/known_file_size | 1 +
test/t/util/test_cast_with_assert.cpp | 10 +-
test/t/util/test_config.cpp | 75 ++
test/t/util/test_delta.cpp | 31 +
test/t/util/test_file.cpp | 92 +-
test/t/util/test_memory_mapping.cpp | 20 +-
test/t/util/test_options.cpp | 117 +-
test/t/util/test_string.cpp | 57 +-
test/t/util/test_string_matcher.cpp | 41 +-
test/t/util/test_timer_disabled.cpp | 15 +
test/t/util/test_timer_enabled.cpp | 16 +
234 files changed, 8645 insertions(+), 2808 deletions(-)
diff --cc debian/changelog
index dfd5fa2,adb6b37..3cb0c6e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,36 +1,43 @@@
+ libosmium (2.13.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop patches, included upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 26 Aug 2017 08:57:45 +0200
+
+ libosmium (2.13.0-4) unstable; urgency=medium
+
+ * Add upstream patches which should help with test failures on hurd & mips.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 22 Aug 2017 07:52:40 +0200
+
+ libosmium (2.13.0-3) unstable; urgency=medium
+
+ * Ignore test failures on mips & mipsel.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 16 Aug 2017 22:16:31 +0200
+
+ libosmium (2.13.0-2) unstable; urgency=medium
+
+ * Add upstream patch to fix broken test on 32 bit platforms.
+ (closes: #872292)
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 16 Aug 2017 19:34:36 +0200
+
+ libosmium (2.13.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Require at least libprotozero-dev 1.5.2.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 15 Aug 2017 19:06:05 +0200
+
+libosmium (2.12.2-2~bpo9+1) stretch-backports; urgency=medium
+
+ * Rebuild for stretch-backports.
+ * Update branch in gbp.conf & Vcs-Git URL.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 02 Jul 2017 12:23:59 +0200
+
libosmium (2.12.2-2) unstable; urgency=medium
* Bump Standards-Version to 4.0.0, no changes.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git
More information about the Pkg-grass-devel
mailing list