[osmium-tool] 01/02: Merge tag 'debian/1.5.1-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Tue Jan 31 17:34:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository osmium-tool.
commit 1f0c5f915f767579e1b880a2ddf41806f2550841
Merge: b4584ec 46d0056
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Jan 31 18:25:13 2017 +0100
Merge tag 'debian/1.5.1-1' into jessie-backports
Conflicts:
debian/changelog
CHANGELOG.md | 27 +-
CMakeLists.txt | 16 +-
README.md | 15 +-
debian/changelog | 28 ++
debian/control | 2 +-
debian/copyright | 2 +-
debian/examples | 1 +
doc/manual.md | 495 ---------------------
doc/osmium-show.png | Bin 51357 -> 0 bytes
extract-example-config/README.md | 17 +
extract-example-config/berlin.geojson | 122 +++++
extract-example-config/berlin.poly | 115 +++++
extract-example-config/brandenburg.poly | 275 ++++++++++++
extract-example-config/extracts.json | 135 ++++++
extract-example-config/hamburg.poly | 71 +++
extract-example-config/karlsruhe.osm.bz2 | Bin 0 -> 16630 bytes
man/manpage.template | 2 +-
man/osmium-add-locations-to-ways.md | 2 +-
man/osmium-apply-changes.md | 2 +-
man/osmium-cat.md | 2 +-
man/osmium-changeset-filter.md | 2 +-
man/osmium-check-refs.md | 4 +-
man/osmium-derive-changes.md | 2 +-
man/osmium-diff.md | 8 +-
man/osmium-extract.md | 361 +++++++++++++++
man/osmium-file-formats.md | 29 +-
man/osmium-fileinfo.md | 4 +-
man/osmium-getid.md | 6 +-
man/osmium-merge-changes.md | 2 +-
man/osmium-merge.md | 2 +-
man/osmium-renumber.md | 4 +-
man/osmium-show.md | 4 +-
man/osmium-sort.md | 2 +-
man/osmium-time-filter.md | 2 +-
man/osmium.md | 9 +-
man/output-options.md | 2 +-
.../osm-history-splitter2osmium-extract-config.sh | 32 ++
src/CMakeLists.txt | 2 +-
src/cmd.cpp | 12 +-
src/cmd.hpp | 23 +-
src/cmd_factory.cpp | 4 +-
src/command_add_locations_to_ways.cpp | 13 +-
src/command_add_locations_to_ways.hpp | 17 +-
src/command_apply_changes.cpp | 61 ++-
src/command_apply_changes.hpp | 4 +-
src/command_cat.cpp | 13 +-
src/command_cat.hpp | 4 +-
src/command_changeset_filter.cpp | 12 +-
src/command_changeset_filter.hpp | 4 +-
src/command_check_refs.cpp | 13 +-
src/command_check_refs.hpp | 4 +-
src/command_derive_changes.cpp | 23 +-
src/command_derive_changes.hpp | 4 +-
src/command_diff.cpp | 15 +-
src/command_diff.hpp | 4 +-
src/command_extract.cpp | 478 ++++++++++++++++++++
src/command_extract.hpp | 79 ++++
src/command_fileinfo.cpp | 13 +-
src/command_fileinfo.hpp | 4 +-
src/command_getid.cpp | 13 +-
src/command_getid.hpp | 4 +-
src/command_help.cpp | 16 +-
src/command_help.hpp | 4 +-
src/command_merge.cpp | 104 +++--
src/command_merge.hpp | 4 +-
src/command_merge_changes.cpp | 12 +-
src/command_merge_changes.hpp | 4 +-
src/command_renumber.cpp | 12 +-
src/command_renumber.hpp | 4 +-
src/command_show.cpp | 12 +-
src/command_show.hpp | 4 +-
src/command_sort.cpp | 12 +-
src/command_sort.hpp | 4 +-
src/command_time_filter.cpp | 13 +-
src/command_time_filter.hpp | 4 +-
src/commands.cpp | 88 ++++
src/exception.hpp | 4 +-
src/{exception.hpp => extract/error.hpp} | 31 +-
src/extract/extract.cpp | 58 +++
src/extract/extract.hpp | 101 +++++
src/{command_help.hpp => extract/extract_bbox.cpp} | 46 +-
src/{exception.hpp => extract/extract_bbox.hpp} | 32 +-
src/extract/extract_polygon.cpp | 161 +++++++
src/extract/extract_polygon.hpp | 65 +++
src/extract/geojson_file_parser.cpp | 212 +++++++++
src/extract/geojson_file_parser.hpp | 58 +++
src/extract/osm_file_parser.cpp | 85 ++++
src/{exception.hpp => extract/osm_file_parser.hpp} | 34 +-
src/extract/poly_file_parser.cpp | 133 ++++++
src/extract/poly_file_parser.hpp | 78 ++++
src/extract/strategy.hpp | 173 +++++++
src/extract/strategy_complete_ways.cpp | 176 ++++++++
src/extract/strategy_complete_ways.hpp | 65 +++
.../strategy_complete_ways_with_history.cpp | 186 ++++++++
.../strategy_complete_ways_with_history.hpp | 65 +++
src/extract/strategy_simple.cpp | 113 +++++
src/extract/strategy_simple.hpp | 60 +++
src/extract/strategy_smart.cpp | 255 +++++++++++
src/extract/strategy_smart.hpp | 75 ++++
src/io.cpp | 80 ++--
src/main.cpp | 8 +-
src/util.cpp | 69 +++
src/{exception.hpp => util.hpp} | 34 +-
test/CMakeLists.txt | 9 +-
test/extract/empty-root.geojson | 1 +
test/extract/empty.geojson | 0
test/extract/empty.osm.opl | 0
test/extract/empty.poly | 0
test/extract/invalid-root.geojson | 1 +
test/extract/invalid.geojson | 1 +
test/extract/missing-end-polygon.poly | 8 +
test/extract/missing-end-ring.poly | 7 +
test/extract/multipolygon.osm.opl | 17 +
test/extract/no-polygon.osm.opl | 5 +
test/extract/one-line.poly | 1 +
test/extract/polygon-crlf.poly | 9 +
test/extract/polygon-one-outer.poly | 9 +
test/extract/polygon-outer-inner.poly | 16 +
test/extract/polygon-two-outer.poly | 16 +
test/extract/polygon-two-ways.osm.opl | 10 +
test/extract/polygon-way.osm.opl | 5 +
test/extract/test_unit.cpp | 277 ++++++++++++
test/extract/two-line.poly | 2 +
test/extract/two-polygons-empty-line.poly | 26 ++
test/extract/two-polygons.poly | 25 ++
test/extract/wrong-geometry-type.geojson | 6 +
test/include/catch.hpp | 14 +-
test/util/test_unit.cpp | 25 ++
zsh_completion/_osmium | 45 +-
129 files changed, 4932 insertions(+), 984 deletions(-)
diff --cc debian/changelog
index 9427085,e2aed41..5aa0396
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,31 +1,37 @@@
+ osmium-tool (1.5.1-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 20 Jan 2017 17:46:15 +0100
+
+ osmium-tool (1.5.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Drop spelling-errors.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 19 Jan 2017 16:46:03 +0100
+
+ osmium-tool (1.5.0-1~exp2) experimental; urgency=medium
+
+ * Bump minimum required libosmium2-dev to 2.11.0.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 19 Jan 2017 00:38:26 +0100
+
+ osmium-tool (1.5.0-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update copyright years for Jochen Topf.
+ * Include extract config examples.
+ * Add patch to fix spelling errors.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 18 Jan 2017 20:35:07 +0100
+
+osmium-tool (1.4.1-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 26 Nov 2016 10:25:38 +0100
+
osmium-tool (1.4.1-1) unstable; urgency=medium
* Move from experimental to unstable.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git
More information about the Pkg-grass-devel
mailing list