[libosmium] 01/02: Merge tag 'debian/2.7.1-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Jun 7 17:40:59 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 f220ae2e99fddd9002e42b5fd0dd636f4183997d
Merge: cfcde49 cf1d9eb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Jun 7 19:22:00 2016 +0200
Merge tag 'debian/2.7.1-1' into jessie-backports
Conflicts:
debian/changelog
.travis.yml | 3 +-
CHANGELOG.md | 54 +-
CMakeLists.txt | 2 +-
debian/changelog | 8 +
debian/control | 2 +-
debian/watch | 2 +-
include/gdalcpp.hpp | 91 +-
include/osmium/area/assembler.hpp | 1530 +++++++++++++++-----
include/osmium/area/detail/node_ref_segment.hpp | 309 ++--
include/osmium/area/detail/proto_ring.hpp | 235 ++-
include/osmium/area/detail/segment_list.hpp | 164 ++-
include/osmium/area/detail/vector.hpp | 120 ++
include/osmium/area/multipolygon_collector.hpp | 26 +-
include/osmium/area/problem_reporter.hpp | 76 +-
include/osmium/area/problem_reporter_exception.hpp | 30 +-
include/osmium/area/problem_reporter_ogr.hpp | 143 +-
include/osmium/area/problem_reporter_stream.hpp | 33 +-
include/osmium/area/stats.hpp | 128 ++
include/osmium/builder/osm_object_builder.hpp | 12 +-
include/osmium/diff_iterator.hpp | 8 +-
include/osmium/dynamic_handler.hpp | 2 +-
include/osmium/geom/factory.hpp | 18 +-
include/osmium/geom/geojson.hpp | 10 +-
include/osmium/geom/geos.hpp | 10 +-
include/osmium/geom/ogr.hpp | 35 +-
include/osmium/geom/rapid_geojson.hpp | 10 +-
include/osmium/geom/wkb.hpp | 13 +-
include/osmium/geom/wkt.hpp | 10 +-
include/osmium/handler/chain.hpp | 2 +-
include/osmium/handler/disk_store.hpp | 2 +-
include/osmium/handler/node_locations_for_ways.hpp | 16 +-
include/osmium/handler/object_relations.hpp | 2 +-
include/osmium/index/detail/mmap_vector_base.hpp | 31 +-
include/osmium/index/detail/mmap_vector_file.hpp | 17 +-
include/osmium/index/detail/vector_map.hpp | 16 +-
include/osmium/index/detail/vector_multimap.hpp | 8 +-
include/osmium/index/map.hpp | 12 +-
include/osmium/index/map/sparse_mem_map.hpp | 2 +-
include/osmium/index/multimap.hpp | 8 +-
include/osmium/index/multimap/hybrid.hpp | 14 +-
.../osmium/index/multimap/sparse_mem_multimap.hpp | 11 +-
include/osmium/io/compression.hpp | 14 +-
include/osmium/io/detail/debug_output_format.hpp | 38 +
include/osmium/io/detail/input_format.hpp | 14 +-
include/osmium/io/detail/opl_output_format.hpp | 38 +-
include/osmium/io/detail/output_format.hpp | 4 +-
include/osmium/io/detail/pbf_decoder.hpp | 24 +-
include/osmium/io/detail/pbf_output_format.hpp | 35 +-
include/osmium/io/detail/protobuf_tags.hpp | 4 +-
include/osmium/io/detail/queue_util.hpp | 19 +-
include/osmium/io/detail/string_table.hpp | 13 +-
include/osmium/io/detail/xml_input_format.hpp | 126 +-
include/osmium/io/detail/xml_output_format.hpp | 30 +-
include/osmium/io/input_iterator.hpp | 20 +-
include/osmium/io/output_iterator.hpp | 8 +-
include/osmium/memory/buffer.hpp | 10 +
include/osmium/memory/collection.hpp | 16 +-
include/osmium/memory/item.hpp | 2 +-
include/osmium/memory/item_iterator.hpp | 110 +-
include/osmium/object_pointer_collection.hpp | 4 +-
include/osmium/osm/area.hpp | 33 +-
include/osmium/osm/changeset.hpp | 18 +-
include/osmium/osm/crc.hpp | 1 +
include/osmium/osm/entity_bits.hpp | 18 +-
include/osmium/osm/location.hpp | 42 +-
include/osmium/osm/object.hpp | 68 +-
include/osmium/osm/object_comparisons.hpp | 26 +-
include/osmium/osm/relation.hpp | 2 +-
include/osmium/osm/tag.hpp | 59 +-
include/osmium/osm/types.hpp | 20 +-
include/osmium/osm/types_from_string.hpp | 18 +-
include/osmium/relations/collector.hpp | 32 +-
include/osmium/relations/detail/member_meta.hpp | 2 +-
include/osmium/relations/detail/relation_meta.hpp | 4 +-
include/osmium/tags/filter.hpp | 18 +-
include/osmium/tags/regex_filter.hpp | 2 +-
include/osmium/thread/pool.hpp | 4 +-
include/osmium/thread/sorted_queue.hpp | 159 --
include/osmium/util/delta.hpp | 11 +-
include/osmium/util/iterator.hpp | 15 +-
include/osmium/util/memory_mapping.hpp | 16 +-
.../{tags/regex_filter.hpp => util/misc.hpp} | 32 +-
include/osmium/util/{iterator.hpp => timer.hpp} | 64 +-
.../osmium/{tags/regex_filter.hpp => version.hpp} | 30 +-
test/CMakeLists.txt | 1 +
test/README | 8 -
test/data-tests/testdata-multipolygon.cpp | 4 +-
test/data-tests/testdata-xml.cpp | 28 +-
test/include/catch.hpp | 382 ++++-
test/t/area/test_node_ref_segment.cpp | 185 ++-
test/t/basic/test_entity_bits.cpp | 1 +
test/t/basic/test_location.cpp | 16 +-
test/t/basic/test_object_comparisons.cpp | 132 +-
test/t/basic/test_types_from_string.cpp | 14 +-
test/t/basic/test_way.cpp | 2 +-
test/t/builder/test_attr.cpp | 4 +-
test/t/geom/test_geojson.cpp | 22 +-
test/t/geom/test_geos.cpp | 4 +
test/t/geom/test_ogr.cpp | 4 +
test/t/index/test_file_based_index.cpp | 155 ++
test/t/index/test_id_to_location.cpp | 10 +
test/t/io/test_writer.cpp | 9 +-
test/t/io/test_writer_with_mock_compression.cpp | 3 +-
test/t/io/test_writer_with_mock_encoder.cpp | 3 +-
test/t/tags/test_tag_list.cpp | 8 +-
test/t/util/test_memory_mapping.cpp | 13 +-
106 files changed, 3910 insertions(+), 1546 deletions(-)
diff --cc debian/changelog
index 34a421a,a67cfba..d3cc1e5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ libosmium (2.7.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump Standards-Version to 3.9.8, no changes.
+ * Update watch file to handle more tag conventions in filenamemangle.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 01 Jun 2016 17:09:14 +0200
+
+libosmium (2.6.1-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 03 Mar 2016 17:54:33 +0100
+
libosmium (2.6.1-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index c9a10c0,065c5a3..fc5a925
--- a/debian/control
+++ b/debian/control
@@@ -18,9 -18,9 +18,9 @@@ Build-Depends: debhelper (>= 9)
libsparsehash-dev,
libutfcpp-dev,
zlib1g-dev
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/libosmium.git/
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/libosmium.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/libosmium.git -b jessie-backports
Homepage: http://osmcode.org/libosmium/
Package: libosmium2-dev
--
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