This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch stretch-backports in repository osmium-tool.
commit 9f093522e18a7b98521890f89a6e468ff23d6ae6 Merge: 9ab3204 8249b2f Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Thu Aug 31 10:49:54 2017 +0200 Merge tag 'debian/1.7.1-1' into stretch-backports CHANGELOG.md | 73 +- CMakeLists.txt | 81 +- CONTRIBUTING.md | 6 + README.md | 4 +- cmake/FindOsmium.cmake | 4 + debian/changelog | 21 + debian/control | 2 +- debian/patches/manpages-install.patch | 14 + debian/patches/series | 1 + debian/rules | 2 +- export-example-config/default-config.json | 16 + export-example-config/example-config.json | 16 + extract-example-config/karlsruhe.osm.bz2 | Bin 16630 -> 16666 bytes man/CMakeLists.txt | 79 ++ man/common-options.md | 2 +- man/osmium-add-locations-to-ways.md | 37 +- man/osmium-apply-changes.md | 4 + man/osmium-cat.md | 4 + man/osmium-changeset-filter.md | 7 + man/osmium-check-refs.md | 13 +- man/osmium-derive-changes.md | 4 + man/osmium-diff.md | 2 +- man/osmium-export.md | 282 +++++ man/osmium-file-formats.md | 44 +- man/osmium-fileinfo.md | 6 +- man/osmium-getid.md | 9 +- man/osmium-index-types.md | 62 + man/osmium-merge-changes.md | 4 + man/osmium-merge.md | 13 +- man/osmium-renumber.md | 14 +- man/osmium-show.md | 2 + man/osmium-sort.md | 20 +- man/osmium-time-filter.md | 11 +- man/osmium.md | 6 +- src/CMakeLists.txt | 42 +- src/command_add_locations_to_ways.cpp | 11 +- src/command_add_locations_to_ways.hpp | 6 +- src/command_apply_changes.cpp | 7 +- src/command_cat.hpp | 4 - src/command_changeset_filter.cpp | 10 +- src/command_changeset_filter.hpp | 1 + src/command_check_refs.cpp | 52 +- src/command_export.cpp | 427 +++++++ src/command_export.hpp | 87 ++ src/command_extract.cpp | 85 +- src/command_extract.hpp | 5 +- src/command_fileinfo.cpp | 22 +- src/command_getid.cpp | 2 + src/command_getid.hpp | 3 +- src/command_help.cpp | 12 +- src/command_renumber.cpp | 41 +- src/command_renumber.hpp | 7 +- src/command_show.cpp | 1 + src/command_show.hpp | 2 - src/command_tags_filter.cpp | 70 +- src/command_time_filter.cpp | 1 + src/commands.cpp | 5 + src/{command_show.hpp => export/export_format.hpp} | 53 +- src/export/export_format_json.cpp | 219 ++++ src/export/export_format_json.hpp | 87 ++ src/export/export_format_text.cpp | 200 ++++ src/export/export_format_text.hpp | 71 ++ src/export/export_handler.cpp | 127 ++ src/export/export_handler.hpp | 82 ++ .../extract_bbox.cpp => export/options.hpp} | 42 +- src/extract/extract_bbox.cpp | 6 +- src/extract/extract_polygon.cpp | 2 +- src/extract/poly_file_parser.hpp | 2 +- src/extract/strategy_complete_ways.cpp | 2 +- .../strategy_complete_ways_with_history.cpp | 2 +- src/extract/strategy_simple.cpp | 2 +- src/extract/strategy_smart.cpp | 8 +- src/io.cpp | 2 - src/main.cpp | 5 + src/util.cpp | 94 ++ src/util.hpp | 20 +- test/CMakeLists.txt | 3 +- test/export/CMakeLists.txt | 26 + .../input-incomplete-relation.osm} | 22 +- .../input-missing-node.osm} | 24 +- .../input-sorted.osm => export/input.osm} | 23 +- test/export/output-incomplete-relation.geojson | 5 + test/export/output-missing-node.geojson | 5 + test/export/output.geojson | 6 + test/export/output.geojsonseq | 4 + test/extract/CMakeLists.txt | 6 + test/extract/config.json | 10 + test/fileinfo/CMakeLists.txt | 11 +- test/getid/CMakeLists.txt | 2 +- test/getid/idfile | 6 +- .../input-sorted.osm => getid/output-file.osm} | 17 +- test/include/catch.hpp | 1222 +++++++++++++------- test/renumber/CMakeLists.txt | 4 +- .../renumber/{input-sorted.osm => input-norel.osm} | 9 +- test/renumber/input-sorted.osm | 4 +- test/renumber/output-norel-change.osc | 19 + test/sort/CMakeLists.txt | 8 +- .../input-sorted.osm => sort/input-neg.osm} | 32 +- .../input-sorted.osm => sort/output-neg.osm} | 22 +- test/tags-filter/test_unit.cpp | 57 - test/util/test_unit.cpp | 85 ++ zsh_completion/_osmium | 53 +- 102 files changed, 3531 insertions(+), 948 deletions(-) diff --cc debian/changelog index 2a0201f,752f495..00f9a64 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,24 +1,31 @@@ + osmium-tool (1.7.1-1) unstable; urgency=medium + + * New upstream release. + * Bump minimum required libosmium2-dev to 2.13.1. + * Add patch to fix manpage installation. + + -- Bas Couwenberg <sebas...@debian.org> Sat, 26 Aug 2017 09:00:12 +0200 + + osmium-tool (1.7.0-2) unstable; urgency=medium + + * Ignore test failures on mips64el. + + -- Bas Couwenberg <sebas...@debian.org> Wed, 16 Aug 2017 23:21:31 +0200 + + osmium-tool (1.7.0-1) unstable; urgency=medium + + * New upstream release. + * Bump minimum required libosmium2-dev to 2.13.0. + + -- Bas Couwenberg <sebas...@debian.org> Tue, 15 Aug 2017 19:33:10 +0200 + +osmium-tool (1.6.1-2~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for jessie-backports. + * Update branch in gbp.conf & Vcs-Git URL. + + -- Bas Couwenberg <sebas...@debian.org> Sun, 02 Jul 2017 12:39:17 +0200 + osmium-tool (1.6.1-2) unstable; urgency=medium * Bump Standards-Version to 4.0.0, no changes. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel