[libosmium] 01/02: Merge tag 'debian/2.4.1-3' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Sep 10 22:32:50 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 aa95afbf00648c0bb191773088344e2ba9fb9d42
Merge: ff42c90 09492b9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Sep 8 08:22:28 2015 +0200
Merge tag 'debian/2.4.1-3' into jessie-backports
Conflicts:
debian/changelog
debian/control
.travis.yml | 10 +-
CHANGELOG.md | 82 +-
CMakeLists.txt | 30 +-
EXTERNAL_LICENSES.txt | 233 ++++
README.md | 4 +
appveyor.yml | 43 +-
benchmarks/CMakeLists.txt | 1 +
benchmarks/osmium_benchmark_count.cpp | 2 -
benchmarks/osmium_benchmark_count_tag.cpp | 2 -
benchmarks/osmium_benchmark_index_map.cpp | 2 -
.../osmium_benchmark_static_vs_dynamic_index.cpp | 1 -
benchmarks/osmium_benchmark_write_pbf.cpp | 34 +
benchmarks/run_benchmark_write_pbf.sh | 28 +
cmake/FindOSMPBF.cmake | 50 -
cmake/FindOsmium.cmake | 77 +-
cmake/iwyu.sh | 4 +-
debian/changelog | 50 +
debian/control | 27 +-
debian/copyright | 46 +
debian/rules | 7 +
debian/watch | 2 +-
examples/CMakeLists.txt | 26 +-
examples/osmium_area_test.cpp | 2 -
examples/osmium_convert.cpp | 1 -
examples/osmium_count.cpp | 2 -
examples/osmium_create_node_cache.cpp | 2 -
examples/osmium_debug.cpp | 2 -
examples/osmium_read.cpp | 2 -
examples/osmium_serdump.cpp | 2 -
examples/osmium_toogr.cpp | 246 ----
examples/osmium_toogr2.cpp | 333 -----
examples/osmium_toogr2_exp.cpp | 307 -----
examples/osmium_use_node_cache.cpp | 2 -
include/boost_unicode_iterator.hpp | 776 -----------
include/gdalcpp.hpp | 302 +++++
include/osmium/area/multipolygon_collector.hpp | 1 +
include/osmium/area/problem_reporter_ogr.hpp | 130 +-
include/osmium/builder/builder.hpp | 24 +-
include/osmium/builder/osm_object_builder.hpp | 104 +-
include/osmium/geom/factory.hpp | 1 +
include/osmium/geom/geos.hpp | 35 +-
include/osmium/geom/ogr.hpp | 30 +-
include/osmium/geom/tile.hpp | 4 +-
include/osmium/geom/wkb.hpp | 10 +-
include/osmium/index/detail/create_map_with_fd.hpp | 2 -
include/osmium/index/detail/mmap_vector_base.hpp | 4 +-
include/osmium/index/detail/mmap_vector_file.hpp | 3 +-
include/osmium/index/map/dense_mmap_array.hpp | 2 +-
include/osmium/index/map/sparse_mem_map.hpp | 2 +-
include/osmium/io/any_input.hpp | 4 +-
include/osmium/io/any_output.hpp | 5 +-
include/osmium/io/bzip2_compression.hpp | 5 +
include/osmium/io/compression.hpp | 5 +
.../osmium/io/{pbf_output.hpp => debug_output.hpp} | 18 +-
include/osmium/io/detail/debug_output_format.hpp | 482 +++++++
include/osmium/io/detail/input_format.hpp | 11 +-
include/osmium/io/detail/opl_output_format.hpp | 75 +-
include/osmium/io/detail/output_format.hpp | 4 +-
include/osmium/io/detail/pbf.hpp | 23 +-
include/osmium/io/detail/pbf_decoder.hpp | 765 +++++++++++
include/osmium/io/detail/pbf_input_format.hpp | 94 +-
include/osmium/io/detail/pbf_output_format.hpp | 1059 ++++++---------
include/osmium/io/detail/pbf_parser.hpp | 456 -------
include/osmium/io/detail/pbf_stringtable.hpp | 218 ----
include/osmium/io/detail/pbf_type_conv.hpp | 73 --
include/osmium/io/detail/protobuf_tags.hpp | 170 +++
include/osmium/io/detail/read_write.hpp | 3 +
include/osmium/io/detail/string_table.hpp | 264 ++++
include/osmium/io/detail/xml_input_format.hpp | 36 +-
include/osmium/io/detail/xml_output_format.hpp | 60 +-
include/osmium/io/detail/zlib.hpp | 15 +-
include/osmium/io/file.hpp | 71 +-
include/osmium/io/file_format.hpp | 8 +-
include/osmium/io/gzip_compression.hpp | 5 +
include/osmium/io/pbf_input.hpp | 1 -
include/osmium/io/pbf_output.hpp | 1 -
include/osmium/io/reader.hpp | 6 +-
include/osmium/io/writer.hpp | 2 +-
include/osmium/memory/buffer.hpp | 3 +-
include/osmium/memory/collection.hpp | 1 -
include/osmium/memory/item.hpp | 1 -
include/osmium/osm/changeset.hpp | 1 -
include/osmium/osm/crc.hpp | 231 ++++
include/osmium/osm/entity.hpp | 1 +
include/osmium/osm/node_ref.hpp | 2 +-
include/osmium/osm/timestamp.hpp | 3 +-
include/osmium/osm/types.hpp | 3 +
include/osmium/thread/queue.hpp | 4 +-
include/osmium/thread/util.hpp | 2 +-
include/osmium/util/data_file.hpp | 2 +
include/osmium/util/delta.hpp | 54 +-
.../osmium/{io/pbf_input.hpp => util/endian.hpp} | 26 +-
include/osmium/util/file.hpp | 1 +
include/osmium/util/memory_mapping.hpp | 120 +-
include/osmium/util/minmax.hpp | 3 -
include/protozero/byteswap.hpp | 49 +
include/protozero/exception.hpp | 68 +
include/protozero/pbf_builder.hpp | 111 ++
include/protozero/pbf_message.hpp | 50 +
include/protozero/pbf_reader.hpp | 1059 +++++++++++++++
include/protozero/pbf_types.hpp | 49 +
include/protozero/pbf_writer.hpp | 664 ++++++++++
include/protozero/varint.hpp | 132 ++
include/protozero/version.hpp | 22 +
include/{osmium/io/pbf_input.hpp => utf8.h} | 29 +-
include/utf8/checked.h | 327 +++++
include/utf8/core.h | 329 +++++
include/utf8/unchecked.h | 228 ++++
scripts/travis_install.sh | 12 +-
scripts/travis_script.sh | 9 +-
test/CMakeLists.txt | 7 +
test/data-tests/testdata-multipolygon.cpp | 171 +--
test/data-tests/testdata-overview.cpp | 154 +--
test/data-tests/testdata-testcases.cpp | 2 -
test/data-tests/testdata-xml.cpp | 115 +-
test/include/catch.hpp | 1355 +++++++++++++-------
test/include/catch_orig.hpp | 1347 ++++++++++++-------
test/t/basic/helper.hpp | 32 +-
test/t/basic/test_box.cpp | 7 +
test/t/basic/test_changeset.cpp | 12 +-
test/t/basic/test_crc.cpp | 70 +
test/t/basic/test_node.cpp | 8 +
test/t/basic/test_relation.cpp | 20 +-
test/t/basic/test_way.cpp | 10 +-
test/t/geom/test_geos.cpp | 35 +-
test/t/io/test_file_formats.cpp | 24 +
test/t/io/test_string_table.cpp | 94 ++
test/t/tags/test_tag_list.cpp | 137 +-
test/t/util/test_delta.cpp | 24 +
test/t/util/test_memory_mapping.cpp | 72 +-
130 files changed, 9182 insertions(+), 5141 deletions(-)
diff --cc debian/changelog
index a1a6377,3efa892..a1fd2a5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,53 +1,59 @@@
+ libosmium (2.4.1-3) unstable; urgency=medium
+
+ * Ignore test failures only on problematic architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 02 Sep 2015 16:36:48 +0200
+
+ libosmium (2.4.1-2) unstable; urgency=medium
+
+ * Don't install protozero headers, use libprotozero-dev instead.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 01 Sep 2015 20:50:51 +0200
+
+ libosmium (2.4.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 29 Aug 2015 16:44:05 +0200
+
+ libosmium (2.4.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop patches, applied upstream.
+ * Update Vcs-Browser URL to use HTTPS.
+ * Update watch file to use lowercase RC in uversionmangle.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 29 Aug 2015 13:04:31 +0200
+
+ libosmium (2.3.0-3) unstable; urgency=medium
+
+ * Add patch to fix test failues on big endian architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 23 Aug 2015 01:02:25 +0200
+
+ libosmium (2.3.0-2) unstable; urgency=medium
+
+ * Add patch to fix FTBFS on big endian architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 22 Aug 2015 22:29:33 +0200
+
+ libosmium (2.3.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop build dependencies on osmpbf & protobuf.
+ * Update copyright file, add license & copyright for protozero & utf8.
+ * Install protozero headers too.
+ * Add (build) dependency on libutfcpp-dev for utf8 headers.
+ * Add dependencies on -dev packages to libosmium2-dev for their headers.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 21 Aug 2015 20:51:17 +0200
+
+libosmium (2.2.0-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 10 Jul 2015 21:47:04 +0200
+
libosmium (2.2.0-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index 4830c57,1c826d7..3cbed1b
--- a/debian/control
+++ b/debian/control
@@@ -17,11 -14,13 +14,13 @@@ Build-Depends: debhelper (>= 9)
libgdal-dev,
libgeos++-dev,
libproj-dev,
- doxygen,
- graphviz
+ libprotozero-dev,
+ libsparsehash-dev,
+ libutfcpp-dev,
+ zlib1g-dev
Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libosmium.git/
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/libosmium.git/
-Vcs-Git: git://anonscm.debian.org/pkg-grass/libosmium.git
+Vcs-Git: git://anonscm.debian.org/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