[libosmium] 01/02: Merge tag 'debian/2.11.0-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Mon Jan 30 18:55:34 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository libosmium.
commit 68582dd5c188a22e2d0d1dcd45afe2ee9d6d9d51
Merge: 6f4d62b 4033fee
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Jan 30 19:43:09 2017 +0100
Merge tag 'debian/2.11.0-1' into jessie-backports
Conflicts:
debian/changelog
CHANGELOG.md | 37 ++
CMakeLists.txt | 4 +-
CONTRIBUTING.md | 2 +-
Makefile | 25 -
NOTES_FOR_DEVELOPERS.md | 18 +-
README.md | 46 +-
debian/changelog | 14 +
debian/copyright | 2 +-
debian/rules | 11 +-
doc/Doxyfile.in | 6 +-
doc/doc.md | 21 +
doc/doc.txt | 26 -
examples/CMakeLists.txt | 1 +
examples/README.md | 7 +-
examples/osmium_amenity_list.cpp | 167 +++++++
examples/osmium_area_test.cpp | 1 +
include/osmium/area/assembler.hpp | 2 +-
include/osmium/area/detail/node_ref_segment.hpp | 2 +-
include/osmium/area/detail/proto_ring.hpp | 2 +-
include/osmium/area/detail/segment_list.hpp | 2 +-
include/osmium/area/detail/vector.hpp | 2 +-
include/osmium/area/multipolygon_collector.hpp | 7 +-
include/osmium/area/problem_reporter.hpp | 2 +-
include/osmium/area/problem_reporter_exception.hpp | 2 +-
include/osmium/area/problem_reporter_ogr.hpp | 2 +-
include/osmium/area/problem_reporter_stream.hpp | 2 +-
include/osmium/area/stats.hpp | 2 +-
include/osmium/builder/attr.hpp | 2 +-
include/osmium/builder/builder.hpp | 2 +-
include/osmium/builder/builder_helper.hpp | 2 +-
include/osmium/builder/osm_object_builder.hpp | 2 +-
include/osmium/diff_handler.hpp | 2 +-
include/osmium/diff_iterator.hpp | 2 +-
include/osmium/diff_visitor.hpp | 6 +-
include/osmium/dynamic_handler.hpp | 5 +-
include/osmium/experimental/flex_reader.hpp | 2 +-
include/osmium/fwd.hpp | 2 +-
include/osmium/geom/coordinates.hpp | 78 ++-
include/osmium/geom/factory.hpp | 2 +-
include/osmium/geom/geojson.hpp | 2 +-
include/osmium/geom/geos.hpp | 2 +-
include/osmium/geom/haversine.hpp | 4 +-
include/osmium/geom/mercator_projection.hpp | 53 ++-
include/osmium/geom/ogr.hpp | 2 +-
include/osmium/geom/projection.hpp | 2 +-
include/osmium/geom/rapid_geojson.hpp | 2 +-
include/osmium/geom/relations.hpp | 2 +-
include/osmium/geom/tile.hpp | 82 +++-
include/osmium/geom/util.hpp | 2 +-
include/osmium/geom/wkb.hpp | 2 +-
include/osmium/geom/wkt.hpp | 2 +-
include/osmium/handler.hpp | 2 +-
include/osmium/handler/chain.hpp | 6 +-
include/osmium/handler/check_order.hpp | 8 +-
include/osmium/handler/disk_store.hpp | 2 +-
include/osmium/handler/dump.hpp | 2 +-
include/osmium/handler/node_locations_for_ways.hpp | 6 +-
include/osmium/handler/object_relations.hpp | 2 +-
include/osmium/index/bool_vector.hpp | 2 +-
include/osmium/index/detail/create_map_with_fd.hpp | 2 +-
include/osmium/index/detail/mmap_vector_anon.hpp | 2 +-
include/osmium/index/detail/mmap_vector_base.hpp | 27 +-
include/osmium/index/detail/mmap_vector_file.hpp | 2 +-
include/osmium/index/detail/tmpfile.hpp | 2 +-
include/osmium/index/detail/vector_map.hpp | 57 ++-
include/osmium/index/detail/vector_multimap.hpp | 2 +-
include/osmium/index/id_set.hpp | 2 +-
include/osmium/index/index.hpp | 2 +-
include/osmium/index/map.hpp | 23 +-
include/osmium/index/map/all.hpp | 2 +-
include/osmium/index/map/dense_file_array.hpp | 2 +-
include/osmium/index/map/dense_mem_array.hpp | 2 +-
include/osmium/index/map/dense_mmap_array.hpp | 2 +-
include/osmium/index/map/dummy.hpp | 8 +-
include/osmium/index/map/sparse_file_array.hpp | 2 +-
include/osmium/index/map/sparse_mem_array.hpp | 2 +-
include/osmium/index/map/sparse_mem_map.hpp | 14 +-
include/osmium/index/map/sparse_mem_table.hpp | 14 +-
include/osmium/index/map/sparse_mmap_array.hpp | 2 +-
include/osmium/index/multimap.hpp | 2 +-
include/osmium/index/multimap/all.hpp | 2 +-
include/osmium/index/multimap/hybrid.hpp | 2 +-
.../osmium/index/multimap/sparse_file_array.hpp | 2 +-
include/osmium/index/multimap/sparse_mem_array.hpp | 2 +-
.../osmium/index/multimap/sparse_mem_multimap.hpp | 2 +-
.../osmium/index/multimap/sparse_mmap_array.hpp | 2 +-
include/osmium/index/node_locations_map.hpp | 2 +-
include/osmium/index/relations_map.hpp | 292 ++++++++++++
include/osmium/io/any_compression.hpp | 2 +-
include/osmium/io/any_input.hpp | 2 +-
include/osmium/io/any_output.hpp | 2 +-
include/osmium/io/bzip2_compression.hpp | 2 +-
include/osmium/io/compression.hpp | 2 +-
include/osmium/io/debug_output.hpp | 2 +-
include/osmium/io/detail/debug_output_format.hpp | 2 +-
include/osmium/io/detail/input_format.hpp | 2 +-
include/osmium/io/detail/o5m_input_format.hpp | 2 +-
include/osmium/io/detail/opl_input_format.hpp | 2 +-
include/osmium/io/detail/opl_output_format.hpp | 2 +-
include/osmium/io/detail/opl_parser_functions.hpp | 2 +-
include/osmium/io/detail/output_format.hpp | 2 +-
include/osmium/io/detail/pbf.hpp | 2 +-
include/osmium/io/detail/pbf_decoder.hpp | 2 +-
include/osmium/io/detail/pbf_input_format.hpp | 2 +-
include/osmium/io/detail/pbf_output_format.hpp | 2 +-
include/osmium/io/detail/protobuf_tags.hpp | 2 +-
include/osmium/io/detail/queue_util.hpp | 2 +-
include/osmium/io/detail/read_thread.hpp | 2 +-
include/osmium/io/detail/read_write.hpp | 2 +-
include/osmium/io/detail/string_table.hpp | 2 +-
include/osmium/io/detail/string_util.hpp | 2 +-
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 | 2 +-
include/osmium/io/detail/zlib.hpp | 2 +-
include/osmium/io/error.hpp | 2 +-
include/osmium/io/file.hpp | 2 +-
include/osmium/io/file_compression.hpp | 2 +-
include/osmium/io/file_format.hpp | 2 +-
include/osmium/io/gzip_compression.hpp | 2 +-
include/osmium/io/header.hpp | 2 +-
include/osmium/io/input_iterator.hpp | 2 +-
include/osmium/io/o5m_input.hpp | 2 +-
include/osmium/io/opl_input.hpp | 2 +-
include/osmium/io/opl_output.hpp | 2 +-
include/osmium/io/output_iterator.hpp | 2 +-
include/osmium/io/overwrite.hpp | 2 +-
include/osmium/io/pbf_input.hpp | 2 +-
include/osmium/io/pbf_output.hpp | 2 +-
include/osmium/io/reader.hpp | 2 +-
include/osmium/io/reader_iterator.hpp | 2 +-
include/osmium/io/writer.hpp | 2 +-
include/osmium/io/writer_options.hpp | 2 +-
include/osmium/io/xml_input.hpp | 2 +-
include/osmium/io/xml_output.hpp | 2 +-
include/osmium/memory/buffer.hpp | 4 +-
include/osmium/memory/collection.hpp | 8 +-
include/osmium/memory/item.hpp | 6 +-
include/osmium/memory/item_iterator.hpp | 89 +---
include/osmium/object_pointer_collection.hpp | 2 +-
include/osmium/opl.hpp | 2 +-
include/osmium/osm.hpp | 2 +-
include/osmium/osm/area.hpp | 34 +-
include/osmium/osm/box.hpp | 2 +-
include/osmium/osm/changeset.hpp | 8 +-
include/osmium/osm/crc.hpp | 2 +-
include/osmium/osm/diff_object.hpp | 2 +-
include/osmium/osm/entity.hpp | 14 +-
include/osmium/osm/entity_bits.hpp | 22 +-
include/osmium/osm/item_type.hpp | 2 +-
include/osmium/osm/location.hpp | 2 +-
include/osmium/osm/node.hpp | 6 +-
include/osmium/osm/node_ref.hpp | 2 +-
include/osmium/osm/node_ref_list.hpp | 32 +-
include/osmium/osm/object.hpp | 16 +-
include/osmium/osm/object_comparisons.hpp | 2 +-
include/osmium/osm/relation.hpp | 11 +-
include/osmium/osm/segment.hpp | 2 +-
include/osmium/osm/tag.hpp | 2 +-
include/osmium/osm/timestamp.hpp | 2 +-
include/osmium/osm/types.hpp | 2 +-
include/osmium/osm/types_from_string.hpp | 6 +-
include/osmium/osm/undirected_segment.hpp | 2 +-
include/osmium/osm/way.hpp | 23 +-
include/osmium/relations/collector.hpp | 44 +-
include/osmium/relations/detail/member_meta.hpp | 2 +-
include/osmium/relations/detail/relation_meta.hpp | 2 +-
include/osmium/tags/filter.hpp | 2 +-
include/osmium/tags/regex_filter.hpp | 9 +-
include/osmium/tags/taglist.hpp | 2 +-
include/osmium/thread/function_wrapper.hpp | 2 +-
include/osmium/thread/pool.hpp | 2 +-
include/osmium/thread/queue.hpp | 2 +-
include/osmium/thread/util.hpp | 2 +-
include/osmium/util/cast.hpp | 2 +-
include/osmium/util/compatibility.hpp | 2 +-
include/osmium/util/config.hpp | 4 +-
include/osmium/util/delta.hpp | 2 +-
include/osmium/util/double.hpp | 6 +-
include/osmium/util/endian.hpp | 6 +-
include/osmium/util/file.hpp | 2 +-
include/osmium/util/iterator.hpp | 2 +-
include/osmium/util/memory.hpp | 9 +-
include/osmium/util/memory_mapping.hpp | 7 +-
include/osmium/util/minmax.hpp | 6 +-
include/osmium/util/misc.hpp | 4 +-
include/osmium/util/options.hpp | 2 +-
include/osmium/util/progress_bar.hpp | 2 +-
include/osmium/util/string.hpp | 2 +-
include/osmium/util/timer.hpp | 2 +-
include/osmium/util/verbose_output.hpp | 2 +-
include/osmium/version.hpp | 8 +-
include/osmium/visitor.hpp | 168 +++----
include/protozero/byteswap.hpp | 2 +-
include/protozero/pbf_builder.hpp | 7 +-
include/protozero/pbf_reader.hpp | 72 ++-
include/protozero/pbf_writer.hpp | 66 ++-
include/protozero/types.hpp | 15 +-
include/protozero/varint.hpp | 14 +-
include/protozero/version.hpp | 7 +-
test/CMakeLists.txt | 3 +
test/examples/t/amenity_list/CMakeLists.txt | 7 +
test/examples/t/amenity_list/node.osm | 7 +
test/include/catch.hpp | 14 +-
test/t/area/test_area_id.cpp | 35 +-
test/t/area/test_node_ref_segment.cpp | 292 ++++++------
test/t/builder/test_attr.cpp | 18 +-
test/t/builder/test_object_builder.cpp | 20 +-
test/t/geom/test_coordinates.cpp | 71 +++
test/t/geom/test_crs.cpp | 2 -
test/t/geom/test_tile.cpp | 16 +
test/t/geom/test_wkb.cpp | 16 +-
test/t/index/test_id_to_location.cpp | 20 +
test/t/index/test_relations_map.cpp | 50 ++
test/t/io/test_bzip2.cpp | 34 +-
test/t/io/test_file_formats.cpp | 528 ++++++++++-----------
test/t/io/test_output_iterator.cpp | 23 +-
test/t/io/test_reader.cpp | 264 +++++------
test/t/io/test_reader_with_mock_decompression.cpp | 18 +-
test/t/io/test_reader_with_mock_parser.cpp | 14 +-
test/t/io/test_string_table.cpp | 2 +-
test/t/io/test_writer.cpp | 24 +-
test/t/io/test_writer_with_mock_compression.cpp | 8 +-
test/t/io/test_writer_with_mock_encoder.cpp | 8 +-
test/t/memory/test_type_is_compatible.cpp | 72 +++
test/t/osm/test_area.cpp | 6 +
test/t/osm/test_node_ref.cpp | 133 +++---
test/t/osm/test_way.cpp | 14 +-
test/t/tags/test_filter.cpp | 163 ++++---
test/t/util/test_memory.cpp | 3 +
230 files changed, 2550 insertions(+), 1416 deletions(-)
diff --cc debian/changelog
index 9e92a81,f53cc97..b26e70d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,23 @@@
+ libosmium (2.11.0-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 17 Jan 2017 18:29:43 +0100
+
+ libosmium (2.11.0-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update copyright years for Jochen Topf.
+ * Skip tests when build-arch target was not executed.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 14 Jan 2017 13:18:06 +0100
+
+libosmium (2.10.3-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 26 Nov 2016 10:11:15 +0100
+
libosmium (2.10.3-1) unstable; urgency=medium
* Move from experimental to unstable.
--
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