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 ca7076150ec431461e47605aa8543751233edda9 Merge: 8468cc7 849c5d9 Author: Bas Couwenberg <[email protected]> Date: Tue Jun 14 19:33:54 2016 +0200 Merge tag 'debian/1.3.1-1' into jessie-backports Conflicts: debian/changelog debian/control .travis.yml | 149 +- CHANGELOG.md | 26 +- CMakeLists.txt | 16 +- Makefile | 5 +- README.md | 4 +- cmake/run_test_compare_output.cmake | 12 +- debian/changelog | 19 + debian/control | 4 +- debian/copyright | 2 +- debian/patches/output-typo.patch | 15 + debian/patches/series | 1 + debian/rules | 3 + debian/watch | 2 +- man/common-options.md | 9 + man/input-options.md | 8 + man/osmium-add-locations-to-ways.md | 94 + man/osmium-apply-changes.md | 48 +- man/osmium-cat.md | 46 +- man/osmium-changeset-filter.md | 66 +- man/osmium-check-refs.md | 36 +- man/osmium-fileinfo.md | 17 +- man/osmium-getid.md | 110 +- man/osmium-merge-changes.md | 58 +- man/osmium-renumber.md | 69 +- man/osmium-show.md | 95 + man/osmium-sort.md | 52 +- man/osmium-time-filter.md | 50 +- man/osmium.md | 37 + man/output-options.md | 26 + scripts/travis_script.sh | 36 - src/CMakeLists.txt | 2 +- src/cmd.cpp | 84 + src/cmd.hpp | 40 +- src/cmd_factory.cpp | 2 +- src/command_add_locations_to_ways.cpp | 173 ++ src/command_add_locations_to_ways.hpp | 76 + src/command_apply_changes.cpp | 26 +- src/command_apply_changes.hpp | 10 +- src/command_cat.cpp | 55 +- src/command_cat.hpp | 12 +- src/command_changeset_filter.cpp | 26 +- src/command_changeset_filter.hpp | 10 +- src/command_check_refs.cpp | 100 +- src/command_check_refs.hpp | 10 +- src/command_fileinfo.cpp | 24 +- src/command_fileinfo.hpp | 10 +- src/command_getid.cpp | 369 ++- src/command_getid.hpp | 52 +- src/command_help.cpp | 9 +- src/command_help.hpp | 11 +- src/command_merge_changes.cpp | 26 +- src/command_merge_changes.hpp | 10 +- src/command_renumber.cpp | 214 +- src/command_renumber.hpp | 96 +- src/command_show.cpp | 225 ++ src/{command_cat.hpp => command_show.hpp} | 30 +- src/command_sort.cpp | 26 +- src/command_sort.hpp | 10 +- src/command_time_filter.cpp | 24 +- src/command_time_filter.hpp | 11 +- src/exception.hpp | 2 +- src/io.cpp | 31 +- src/main.cpp | 13 +- test/CMakeLists.txt | 27 +- test/add-locations-to-ways/CMakeLists.txt | 17 + .../input.osm} | 11 +- .../output-n.osm} | 19 +- test/add-locations-to-ways/output.osm | 17 + test/cat/output1.osm.opl | 6 +- test/changeset-filter/output1-all.osm | 2 +- test/changeset-filter/output1-first.osm | 2 +- test/check-refs/CMakeLists.txt | 44 +- test/check-refs/fail-n-in-r.osm | 6 + test/check-refs/{nw-okay.osm => fail-n-in-w.osm} | 6 - test/check-refs/fail-r-in-r-1.osm | 6 + test/check-refs/fail-r-in-r-2.osm | 6 + test/check-refs/fail-w-in-r.osm | 6 + test/check-refs/okay-r-in-r.osm | 9 + test/check-refs/{nw-okay.osm => okay.osm} | 4 + test/check-refs/{nw-okay.osm => way-okay.osm} | 2 +- test/formats/f1.osm.opl | 8 +- test/getid/CMakeLists.txt | 38 + test/getid/idfile | 5 + test/getid/in10.id | 1 + test/getid/in10.osm | 4 + test/getid/in19.id | 1 + test/getid/in19.osm | 4 + test/getid/in21.id | 1 + test/getid/in21.osm | 7 + test/getid/in29.id | 1 + test/getid/in29.osm | 7 + test/getid/in30.id | 1 + test/getid/in30.osm | 8 + test/getid/in31.id | 1 + test/getid/in31.osm | 6 + test/getid/in32.id | 1 + test/getid/in32.osm | 6 + test/getid/in39.id | 1 + test/getid/in39.osm | 6 + test/getid/out10.osm | 4 + test/getid/out21.osm | 9 + test/{check-refs/nw-okay.osm => getid/out30.osm} | 6 +- test/{sort/output-bounds.osm => getid/out31.osm} | 15 +- test/getid/out32.osm | 7 + test/getid/relloop-out.osm | 9 + test/getid/relloop.id | 2 + test/getid/relloop.osm | 9 + .../output-bounds.osm => getid/source-no-rr.osm} | 18 +- test/{sort/output-bounds.osm => getid/source.osm} | 21 +- test/help/CMakeLists.txt | 8 +- test/include/catch.hpp | 3045 ++++++++++++-------- test/misc/CMakeLists.txt | 2 +- .../nw-okay.osm => order/fail-order-n.osm} | 11 +- .../nw-okay.osm => order/fail-order-r.osm} | 7 + .../nwr-okay.osm => order/fail-order-rw.osm} | 5 +- .../nw-okay.osm => order/fail-order-w.osm} | 9 +- .../nw-okay.osm => order/fail-order-wn.osm} | 9 +- test/renumber/CMakeLists.txt | 24 +- test/sort/output-bounds.osm | 2 +- zsh_completion/_osmium | 53 +- 120 files changed, 4495 insertions(+), 2011 deletions(-) diff --cc debian/changelog index 16e9054,c9921ca..63d5a31 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,22 +1,28 @@@ + osmium-tool (1.3.1-1) unstable; urgency=medium + + * New upstream release. + * Update copyright file, update copyright years for Jochen Topf. + * Drop spelling-errors.patch, applied upstream. + * Add patch to fix 'output' typo. + + -- Bas Couwenberg <[email protected]> Wed, 08 Jun 2016 21:23:37 +0200 + + osmium-tool (1.3.0-2) unstable; urgency=medium + + * Update Vcs-Git URL to use HTTPS. + * Bump Standards-Version to 3.9.8, no changes. + * Update watch file to handle more tag conventions in filenamemangle. + * Enable all hardening buildflags. + * Add patch to fix spelling errors. + + -- Bas Couwenberg <[email protected]> Wed, 01 Jun 2016 17:44:22 +0200 + +osmium-tool (1.3.0-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <[email protected]> Fri, 11 Dec 2015 12:09:06 +0100 + osmium-tool (1.3.0-1) unstable; urgency=medium * Move from experimental to unstable. diff --cc debian/control index 746d14c,dddd7d4..d591411 --- a/debian/control +++ b/debian/control @@@ -12,9 -12,9 +12,9 @@@ Build-Depends: debhelper (>= 9) libosmium2-dev (>= 2.5.3), pandoc, zlib1g-dev - Standards-Version: 3.9.6 + Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmium-tool.git/ - Vcs-Git: git://anonscm.debian.org/pkg-grass/osmium-tool.git -b jessie-backports -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmium-tool.git ++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmium-tool.git -b jessie-backports Homepage: http://osmcode.org/osmium/ Package: osmium-tool -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
