[libosmium] 01/02: Merge tag 'debian/2.10.3-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Sat Nov 26 09:21:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository libosmium.
commit b25c5803804c314591460a95be399e26aff39466
Merge: acdc961 606b895
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Nov 26 10:11:12 2016 +0100
Merge tag 'debian/2.10.3-1' into jessie-backports
Conflicts:
debian/changelog
.travis.yml | 32 +-
CHANGELOG.md | 92 ++++-
CMakeLists.txt | 8 +-
README.md | 4 +-
benchmarks/CMakeLists.txt | 3 +
benchmarks/download_data.sh | 10 +-
benchmarks/osmium_benchmark_count.cpp | 6 +-
benchmarks/osmium_benchmark_count_tag.cpp | 6 +-
...ark_count.cpp => osmium_benchmark_mercator.cpp} | 26 +-
benchmarks/run_benchmark_mercator.sh | 22 +
benchmarks/setup.sh | 16 +-
cmake/FindOsmium.cmake | 62 ++-
debian/changelog | 49 +++
debian/control | 4 +-
debian/rules | 6 -
examples/CMakeLists.txt | 8 +-
examples/README.md | 12 +
examples/osmium_area_test.cpp | 4 +-
examples/osmium_change_tags.cpp | 203 ++++++++++
examples/osmium_convert.cpp | 8 +-
examples/osmium_create_pois.cpp | 96 +++++
examples/osmium_dump_internal.cpp | 179 +++++++++
examples/osmium_filter_discussions.cpp | 2 +-
examples/osmium_index.cpp | 260 ------------
examples/osmium_index_lookup.cpp | 333 ++++++++++++++++
examples/osmium_pub_names.cpp | 0
examples/osmium_road_length.cpp | 0
examples/osmium_serdump.cpp | 206 ----------
include/osmium/area/assembler.hpp | 52 +--
include/osmium/area/detail/node_ref_segment.hpp | 4 +-
include/osmium/area/detail/segment_list.hpp | 2 +-
include/osmium/area/detail/vector.hpp | 20 +-
include/osmium/builder/attr.hpp | 64 +--
include/osmium/builder/builder.hpp | 91 ++---
include/osmium/builder/osm_object_builder.hpp | 312 +++++++++++++--
include/osmium/geom/factory.hpp | 2 +-
include/osmium/geom/geos.hpp | 16 +-
include/osmium/geom/relations.hpp | 10 +-
include/osmium/geom/tile.hpp | 20 +-
include/osmium/handler/disk_store.hpp | 5 +-
include/osmium/handler/node_locations_for_ways.hpp | 2 +-
include/osmium/handler/object_relations.hpp | 2 +
include/osmium/index/bool_vector.hpp | 41 +-
include/osmium/index/detail/vector_map.hpp | 6 +-
include/osmium/index/id_set.hpp | 434 ++++++++++++++++++++
include/osmium/index/index.hpp | 12 +-
include/osmium/index/map.hpp | 27 +-
include/osmium/index/map/dummy.hpp | 2 +-
include/osmium/index/map/sparse_mem_map.hpp | 2 +-
include/osmium/index/map/sparse_mem_table.hpp | 4 +-
include/osmium/io/compression.hpp | 60 ++-
include/osmium/io/detail/input_format.hpp | 23 +-
include/osmium/io/detail/o5m_input_format.hpp | 104 +++--
include/osmium/io/detail/opl_input_format.hpp | 8 +-
include/osmium/io/detail/opl_parser_functions.hpp | 80 ++--
include/osmium/io/detail/pbf_decoder.hpp | 170 ++++++--
include/osmium/io/detail/pbf_input_format.hpp | 10 +-
include/osmium/io/detail/queue_util.hpp | 15 +-
include/osmium/io/detail/xml_input_format.hpp | 94 +++--
include/osmium/io/file_format.hpp | 5 +
include/osmium/io/header.hpp | 79 +++-
include/osmium/io/reader.hpp | 63 ++-
include/osmium/memory/buffer.hpp | 82 ++--
include/osmium/memory/collection.hpp | 47 ++-
include/osmium/memory/item.hpp | 4 +-
include/osmium/object_pointer_collection.hpp | 35 +-
include/osmium/osm/area.hpp | 12 +-
include/osmium/osm/changeset.hpp | 18 +-
include/osmium/osm/crc.hpp | 42 +-
include/osmium/osm/entity_bits.hpp | 24 +-
include/osmium/osm/location.hpp | 56 +--
include/osmium/osm/node.hpp | 8 +-
include/osmium/osm/node_ref_list.hpp | 33 +-
include/osmium/osm/object.hpp | 8 +
include/osmium/osm/object_comparisons.hpp | 9 +
include/osmium/osm/relation.hpp | 17 +-
include/osmium/osm/tag.hpp | 19 +-
include/osmium/osm/way.hpp | 6 +-
include/osmium/relations/collector.hpp | 58 ++-
include/osmium/relations/detail/member_meta.hpp | 40 +-
include/osmium/thread/queue.hpp | 57 ++-
include/osmium/util/progress_bar.hpp | 12 +
include/osmium/version.hpp | 6 +-
include/protozero/byteswap.hpp | 79 ++--
include/protozero/config.hpp | 11 -
include/protozero/iterators.hpp | 53 +--
include/protozero/pbf_message.hpp | 4 +-
include/protozero/pbf_reader.hpp | 50 ++-
include/protozero/pbf_writer.hpp | 9 +-
include/protozero/types.hpp | 18 +-
include/protozero/version.hpp | 4 +-
test/CMakeLists.txt | 53 ++-
test/data-tests/testdata-xml.cpp | 2 +-
test/examples/CMakeLists.txt | 21 +
test/examples/t/pub_names/CMakeLists.txt | 7 +
test/examples/t/pub_names/pubs.osm | 7 +
test/examples/t/road_length/CMakeLists.txt | 8 +
test/examples/t/road_length/road.osm | 59 +++
test/include/catch.hpp | 50 ++-
test/t/basic/test_entity_bits.cpp | 32 --
test/t/builder/test_object_builder.cpp | 444 +++++++++++++++++++++
test/t/geom/helper.hpp | 15 -
test/t/geom/test_crs.cpp | 10 +-
test/t/geom/test_exception.cpp | 8 +-
test/t/geom/test_factory_with_projection.cpp | 40 +-
test/t/geom/test_geojson.cpp | 193 ++++-----
test/t/geom/test_geos.cpp | 56 +--
test/t/geom/test_geos_wkb.cpp | 92 -----
test/t/geom/test_ogr.cpp | 128 +++---
test/t/geom/test_ogr_wkb.cpp | 101 +++++
test/t/geom/test_projection.cpp | 143 +++----
test/t/geom/test_tile.cpp | 2 -
test/t/geom/test_wkb.cpp | 20 +-
test/t/geom/wnl_helper.hpp | 6 +-
test/t/index/test_id_set.cpp | 166 ++++++++
test/t/index/test_id_to_location.cpp | 165 ++++----
test/t/index/test_object_pointer_collection.cpp | 86 ++++
test/t/io/test_compression_factory.cpp | 27 ++
test/t/io/test_reader_with_mock_parser.cpp | 8 +-
test/t/{buffer => memory}/test_buffer_basics.cpp | 0
test/t/{buffer => memory}/test_buffer_node.cpp | 140 +++----
test/t/{buffer => memory}/test_buffer_purge.cpp | 82 ++--
test/t/{basic => osm}/test_area.cpp | 0
test/t/{basic => osm}/test_box.cpp | 0
test/t/{basic => osm}/test_changeset.cpp | 67 ++--
test/t/{basic => osm}/test_crc.cpp | 0
test/t/osm/test_entity_bits.cpp | 62 +++
test/t/{basic => osm}/test_location.cpp | 125 +++---
test/t/{basic => osm}/test_node.cpp | 0
test/t/{basic => osm}/test_node_ref.cpp | 0
test/t/{basic => osm}/test_object_comparisons.cpp | 0
test/t/{basic => osm}/test_relation.cpp | 0
test/t/{basic => osm}/test_timestamp.cpp | 0
test/t/{basic => osm}/test_types_from_string.cpp | 0
test/t/{basic => osm}/test_way.cpp | 2 +-
135 files changed, 4558 insertions(+), 2188 deletions(-)
diff --cc debian/changelog
index c80fc27,c4413cc..0a6933e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,52 +1,58 @@@
+ libosmium (2.10.3-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 21 Nov 2016 07:18:56 +0100
+
+ libosmium (2.10.3-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Require at least libprotozero-dev 1.4.5.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 20 Nov 2016 18:11:06 +0100
+
+ libosmium (2.10.2-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Require at least libprotozero-dev 1.4.4.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 16 Nov 2016 14:49:53 +0100
+
+ libosmium (2.10.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Require at least libprotozero-dev 1.4.3.
+ * Drop dh_installexamples override, permissions fixed upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 15 Nov 2016 15:07:40 +0100
+
+ libosmium (2.10.0really2.9.0-1) unstable; urgency=medium
+
+ * Revert back to 2.9.0 upstream release to fix IdSet related build failures.
+ * Re-instate dh_installexamples override.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 14 Nov 2016 20:01:41 +0100
+
+ libosmium (2.10.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop dh_installexamples override, permissions fixed upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 12 Nov 2016 06:06:27 +0100
+
+ libosmium (2.9.0-2) unstable; urgency=medium
+
+ * Update dh_installexamples override for -arch only.
+ (closes: #838463)
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 21 Sep 2016 13:00:42 +0200
+
+libosmium (2.9.0-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 21 Sep 2016 09:30:49 +0200
+
libosmium (2.9.0-1) unstable; urgency=medium
* New upstream release.
--
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