[libosmium] 01/02: Merge tag 'debian/2.8.0-2' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Wed Aug 10 18:18:00 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 dbf6f0b2d1e3897ea019e723f43219c0ec392fb1
Merge: d771193 d250ac4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Aug 10 19:50:41 2016 +0200
Merge tag 'debian/2.8.0-2' into jessie-backports
Conflicts:
debian/changelog
.travis.yml | 83 +--
CHANGELOG.md | 39 +-
CMakeLists.txt | 25 +-
appveyor.yml | 2 -
debian/changelog | 13 +
debian/control | 1 -
debian/rules | 2 +-
examples/CMakeLists.txt | 32 +-
examples/osmium_index.cpp | 131 ++--
include/osmium/area/assembler.hpp | 4 +-
include/osmium/geom/factory.hpp | 4 +-
include/osmium/geom/geojson.hpp | 2 +-
include/osmium/geom/geos.hpp | 15 +-
include/osmium/geom/ogr.hpp | 3 +-
include/osmium/geom/rapid_geojson.hpp | 2 +-
include/osmium/geom/wkb.hpp | 9 +-
include/osmium/geom/wkt.hpp | 30 +-
include/osmium/io/detail/debug_output_format.hpp | 2 +-
include/osmium/io/detail/pbf_decoder.hpp | 203 +++---
include/osmium/io/detail/pbf_input_format.hpp | 6 +-
include/osmium/io/detail/pbf_output_format.hpp | 61 +-
include/osmium/io/detail/string_table.hpp | 57 +-
include/osmium/io/detail/zlib.hpp | 6 +-
include/osmium/io/reader.hpp | 22 +-
include/osmium/io/writer.hpp | 12 +-
include/osmium/osm/location.hpp | 41 +-
include/osmium/relations/collector.hpp | 7 -
include/osmium/thread/pool.hpp | 21 +-
include/osmium/thread/queue.hpp | 60 +-
include/osmium/util/config.hpp | 17 +-
include/osmium/util/delta.hpp | 55 +-
include/osmium/version.hpp | 6 +-
include/protozero/byteswap.hpp | 6 +-
include/protozero/exception.hpp | 8 +-
include/protozero/iterators.hpp | 373 +++++++++++
include/protozero/pbf_builder.hpp | 20 +-
include/protozero/pbf_message.hpp | 10 +-
include/protozero/pbf_reader.hpp | 763 +++++++++--------------
include/protozero/pbf_writer.hpp | 240 ++++---
include/protozero/types.hpp | 170 ++++-
include/protozero/varint.hpp | 125 ++--
include/protozero/version.hpp | 17 +-
test/CMakeLists.txt | 41 +-
test/include/catch.hpp | 280 +++++----
test/t/basic/test_location.cpp | 33 +-
test/t/geom/test_geos.cpp | 13 +-
test/t/geom/test_wkb.cpp | 17 +-
test/t/geom/test_wkt.cpp | 15 +
test/t/io/test_string_table.cpp | 40 +-
test/t/util/test_delta.cpp | 22 -
50 files changed, 1980 insertions(+), 1186 deletions(-)
diff --cc debian/changelog
index 2b1f378,7be2645..8135bb0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ libosmium (2.8.0-2) unstable; urgency=medium
+
+ * Ignore test failures on arm64 & ppc64el.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 05 Aug 2016 00:51:55 +0200
+
+ libosmium (2.8.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop libboost-program-options-dev from build dependencies.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 04 Aug 2016 10:36:57 +0200
+
+libosmium (2.7.2-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 14 Jun 2016 19:17:32 +0200
+
libosmium (2.7.2-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