[libosmium] 01/02: Merge tag 'debian/2.5.4-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Dec 11 10:59:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository libosmium.
commit b805639429a59602da7b9d4285da42ed32a42d2f
Merge: 77e8803 04c9eca
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Dec 11 11:39:15 2015 +0100
Merge tag 'debian/2.5.4-1' into jessie-backports
Conflicts:
debian/changelog
.travis.yml | 181 ++++--
CHANGELOG.md | 97 +++-
CMakeLists.txt | 130 ++++-
CONTRIBUTING.md | 47 +-
README.md | 14 +-
cmake/FindOsmium.cmake | 13 +-
cmake/iwyu.sh | 2 +-
debian/changelog | 42 ++
debian/control | 3 +-
debian/libosmium2-dev.install | 3 +-
debian/rules | 8 +-
examples/CMakeLists.txt | 1 +
examples/osmium_filter_discussions.cpp | 72 +++
include/gdalcpp.hpp | 164 +++++-
include/osmium/area/assembler.hpp | 4 +
include/osmium/area/detail/node_ref_segment.hpp | 68 ++-
include/osmium/area/detail/proto_ring.hpp | 9 +-
include/osmium/area/detail/segment_list.hpp | 2 +
include/osmium/area/multipolygon_collector.hpp | 34 +-
include/osmium/area/problem_reporter_exception.hpp | 2 +-
include/osmium/area/problem_reporter_ogr.hpp | 4 +-
include/osmium/area/problem_reporter_stream.hpp | 2 +-
include/osmium/builder/builder.hpp | 4 +-
include/osmium/builder/osm_object_builder.hpp | 95 ++-
include/osmium/diff_handler.hpp | 3 +-
include/osmium/diff_iterator.hpp | 54 +-
include/osmium/diff_visitor.hpp | 14 +-
include/osmium/dynamic_handler.hpp | 35 +-
include/osmium/experimental/flex_reader.hpp | 16 +-
include/osmium/{io/overwrite.hpp => fwd.hpp} | 46 +-
include/osmium/geom/coordinates.hpp | 1 -
include/osmium/geom/factory.hpp | 24 +-
include/osmium/geom/geojson.hpp | 12 +-
include/osmium/geom/geos.hpp | 2 +-
include/osmium/geom/ogr.hpp | 2 +-
include/osmium/geom/rapid_geojson.hpp | 4 +-
include/osmium/geom/tile.hpp | 6 +-
include/osmium/geom/wkb.hpp | 10 +-
include/osmium/geom/wkt.hpp | 12 +-
include/osmium/handler.hpp | 19 +-
include/osmium/handler/chain.hpp | 10 +-
include/osmium/handler/node_locations_for_ways.hpp | 2 +-
include/osmium/index/bool_vector.hpp | 4 +-
include/osmium/index/detail/create_map_with_fd.hpp | 17 +-
include/osmium/index/detail/mmap_vector_anon.hpp | 2 +
include/osmium/index/detail/mmap_vector_base.hpp | 6 +-
include/osmium/index/detail/mmap_vector_file.hpp | 8 +-
include/osmium/index/detail/vector_map.hpp | 36 +-
include/osmium/index/detail/vector_multimap.hpp | 14 +-
include/osmium/index/index.hpp | 2 +-
include/osmium/index/map.hpp | 21 +-
include/osmium/index/map/dummy.hpp | 12 +-
include/osmium/index/map/sparse_mem_map.hpp | 23 +-
include/osmium/index/map/sparse_mem_table.hpp | 15 +-
include/osmium/index/multimap.hpp | 2 +-
include/osmium/index/multimap/hybrid.hpp | 24 +-
.../osmium/index/multimap/sparse_mem_multimap.hpp | 14 +-
include/osmium/io/any_input.hpp | 1 +
include/osmium/io/bzip2_compression.hpp | 79 ++-
include/osmium/io/compression.hpp | 101 ++--
include/osmium/io/detail/debug_output_format.hpp | 227 ++++----
include/osmium/io/detail/input_format.hpp | 146 +++--
include/osmium/io/detail/o5m_input_format.hpp | 636 +++++++++++++++++++++
include/osmium/io/detail/opl_output_format.hpp | 135 ++---
include/osmium/io/detail/output_format.hpp | 64 ++-
include/osmium/io/detail/pbf.hpp | 9 +-
include/osmium/io/detail/pbf_decoder.hpp | 26 +-
include/osmium/io/detail/pbf_input_format.hpp | 183 ++----
include/osmium/io/detail/pbf_output_format.hpp | 306 +++++-----
include/osmium/io/detail/queue_util.hpp | 157 +++++
include/osmium/io/detail/read_thread.hpp | 95 +--
include/osmium/io/detail/read_write.hpp | 59 +-
include/osmium/io/detail/string_table.hpp | 3 +-
include/osmium/io/detail/string_util.hpp | 206 +++++++
include/osmium/io/detail/write_thread.hpp | 63 +-
include/osmium/io/detail/xml_input_format.hpp | 544 ++++++++----------
include/osmium/io/detail/xml_output_format.hpp | 277 ++++-----
include/osmium/io/detail/zlib.hpp | 5 +-
include/osmium/io/error.hpp | 16 +-
include/osmium/io/file.hpp | 5 +-
include/osmium/io/gzip_compression.hpp | 72 ++-
include/osmium/io/input_iterator.hpp | 40 +-
include/osmium/io/{overwrite.hpp => o5m_input.hpp} | 27 +-
include/osmium/io/output_iterator.hpp | 68 ++-
include/osmium/io/overwrite.hpp | 17 +-
include/osmium/io/reader.hpp | 164 ++++--
include/osmium/io/writer.hpp | 269 +++++++--
.../io/{overwrite.hpp => writer_options.hpp} | 16 +-
include/osmium/memory/buffer.hpp | 285 +++++++--
include/osmium/memory/collection.hpp | 6 +-
include/osmium/memory/item.hpp | 6 +-
include/osmium/memory/item_iterator.hpp | 22 +-
include/osmium/object_pointer_collection.hpp | 2 +-
include/osmium/osm/area.hpp | 3 +-
include/osmium/osm/box.hpp | 8 +-
include/osmium/osm/changeset.hpp | 135 ++++-
include/osmium/osm/crc.hpp | 15 +-
include/osmium/osm/diff_object.hpp | 147 ++++-
include/osmium/osm/entity.hpp | 2 +-
include/osmium/osm/item_type.hpp | 17 +-
include/osmium/osm/location.hpp | 18 +-
include/osmium/osm/node.hpp | 4 +-
include/osmium/osm/node_ref.hpp | 100 +++-
include/osmium/osm/node_ref_list.hpp | 33 +-
include/osmium/osm/object.hpp | 18 +-
include/osmium/osm/relation.hpp | 12 +-
include/osmium/osm/segment.hpp | 8 +-
include/osmium/osm/tag.hpp | 5 +-
include/osmium/osm/timestamp.hpp | 122 +++-
include/osmium/osm/types.hpp | 1 +
include/osmium/osm/types_from_string.hpp | 83 ++-
include/osmium/osm/way.hpp | 4 +-
include/osmium/relations/collector.hpp | 177 +++---
include/osmium/relations/detail/member_meta.hpp | 2 +-
include/osmium/tags/filter.hpp | 8 +-
include/osmium/tags/taglist.hpp | 6 +-
include/osmium/thread/function_wrapper.hpp | 30 +-
include/osmium/thread/pool.hpp | 57 +-
include/osmium/thread/queue.hpp | 11 +-
include/osmium/thread/util.hpp | 37 +-
include/osmium/util/compatibility.hpp | 12 +-
include/osmium/util/config.hpp | 2 +-
include/osmium/util/data_file.hpp | 194 -------
include/osmium/util/delta.hpp | 69 ++-
include/osmium/util/double.hpp | 8 +-
include/osmium/util/file.hpp | 6 +-
include/osmium/util/memory_mapping.hpp | 33 +-
include/osmium/util/options.hpp | 76 ++-
include/osmium/visitor.hpp | 38 +-
include/protozero/byteswap.hpp | 34 +-
include/protozero/config.hpp | 57 ++
include/protozero/pbf_builder.hpp | 28 +-
include/protozero/pbf_message.hpp | 44 ++
include/protozero/pbf_reader.hpp | 46 +-
include/protozero/pbf_writer.hpp | 17 +-
include/protozero/version.hpp | 6 +-
scripts/travis_install.sh | 20 -
scripts/travis_script.sh | 36 --
test/CMakeLists.txt | 10 +-
test/data-tests/CMakeLists.txt | 6 +-
test/data-tests/testdata-multipolygon.cpp | 4 +-
test/data-tests/testdata-overview.cpp | 4 +-
test/data-tests/testdata-xml.cpp | 35 +-
test/t/area/test_node_ref_segment.cpp | 14 +
test/t/basic/test_changeset.cpp | 62 +-
test/t/basic/test_node.cpp | 4 +-
test/t/basic/test_object_comparisons.cpp | 44 +-
test/t/basic/test_relation.cpp | 2 +-
test/t/basic/test_timestamp.cpp | 27 +-
test/t/basic/test_way.cpp | 2 +-
test/t/buffer/test_buffer_basics.cpp | 34 ++
test/t/buffer/test_buffer_node.cpp | 78 ++-
test/t/geom/test_tile_data.hpp | 4 +-
test/t/io/deleted_nodes.osh | 5 +
test/t/io/deleted_nodes.osh.pbf | Bin 0 -> 189 bytes
test/t/io/test_output_utils.cpp | 153 +++++
test/t/io/test_reader.cpp | 105 +++-
test/t/io/test_reader_with_mock_decompression.cpp | 145 +++++
test/t/io/test_reader_with_mock_parser.cpp | 123 ++++
test/t/io/test_string_table.cpp | 6 +-
test/t/io/test_writer.cpp | 117 ++++
test/t/io/test_writer_with_mock_compression.cpp | 99 ++++
test/t/io/test_writer_with_mock_encoder.cpp | 105 ++++
test/t/thread/test_pool.cpp | 62 +-
test/t/util/test_data_file.cpp | 81 ---
test/t/util/test_delta.cpp | 34 +-
test/t/util/test_file.cpp | 2 +
test/t/util/test_options.cpp | 49 +-
168 files changed, 6427 insertions(+), 2588 deletions(-)
diff --cc debian/changelog
index 29730cf,5f6a005..21e4f1c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,45 +1,51 @@@
+ libosmium (2.5.4-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 05 Dec 2015 13:48:14 +0100
+
+ libosmium (2.5.4-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Install gdalcpp.hpp in libosmium2-dev too. libosmium2-dev provides
+ libgdalcpp-dev instead of splitting it off into a separate package.
+ * Drop patches, included upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 03 Dec 2015 21:59:52 +0100
+
+ libosmium (2.5.3-1~exp2) experimental; urgency=medium
+
+ * Add patches to fix timestamp test failures.
+ * Create build directory for documentation when not already done by
+ build-arch target.
+ (closes: #806631)
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 29 Nov 2015 22:13:23 +0100
+
+ libosmium (2.5.3-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 18 Nov 2015 22:39:28 +0100
+
+ libosmium (2.5.2-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 07 Nov 2015 01:11:22 +0100
+
+ libosmium (2.5.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 06 Nov 2015 18:40:39 +0100
+
+libosmium (2.4.1-3~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 08 Sep 2015 08:30:11 +0200
+
libosmium (2.4.1-3) unstable; urgency=medium
* Ignore test failures only on problematic architectures.
--
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