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 aa0ec429400d2650d30e22fac9fe84a6fda1c72b Merge: 7ff6f4c 4a6d05b Author: Bas Couwenberg <[email protected]> Date: Sat Nov 26 10:23:53 2016 +0100 Merge tag 'debian/1.4.1-1' into jessie-backports Conflicts: debian/changelog .travis.yml | 28 +++++++++++ CHANGELOG.md | 33 ++++++++++++- CMakeLists.txt | 4 +- README.md | 12 ++--- cmake/FindOsmium.cmake | 62 ++++++++++++++++++------ debian/changelog | 20 ++++++++ debian/control | 2 +- debian/patches/series | 1 - debian/patches/spelling-errors.patch | 47 ------------------- man/osmium-add-locations-to-ways.md | 9 ++++ man/osmium-derive-changes.md | 2 +- man/osmium-diff.md | 16 +++++-- man/osmium-getid.md | 2 + man/osmium-merge.md | 2 +- src/cmd.hpp | 18 ++++--- src/command_add_locations_to_ways.cpp | 18 +++---- src/command_add_locations_to_ways.hpp | 2 +- src/command_apply_changes.cpp | 2 +- src/command_cat.cpp | 8 +--- src/command_cat.hpp | 2 - src/command_changeset_filter.cpp | 2 +- src/command_check_refs.cpp | 29 +++++++----- src/command_derive_changes.cpp | 4 +- src/command_diff.cpp | 28 +++++------ src/command_fileinfo.cpp | 2 +- src/command_getid.cpp | 88 ++++++++++++++++------------------- src/command_getid.hpp | 6 +-- src/command_merge.cpp | 3 +- src/command_merge_changes.cpp | 3 +- src/command_renumber.cpp | 12 ++--- src/command_show.cpp | 12 ++--- src/command_sort.cpp | 3 +- src/command_time_filter.cpp | 3 +- src/io.cpp | 8 ++++ src/main.cpp | 15 ++++-- test/diff/test_setup.cpp | 10 ++-- test/include/catch.hpp | 50 +++++++++++++------- test/io/Makefile.in | 11 +++-- 38 files changed, 340 insertions(+), 239 deletions(-) diff --cc debian/changelog index 6136dac,05664b3..bc6a244 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,23 +1,29 @@@ + osmium-tool (1.4.1-1) unstable; urgency=medium + + * Move from experimental to unstable. + + -- Bas Couwenberg <[email protected]> Mon, 21 Nov 2016 07:19:28 +0100 + + osmium-tool (1.4.1-1~exp1) experimental; urgency=medium + + * New upstream release. + * Drop patches, applied upstream. + + -- Bas Couwenberg <[email protected]> Sun, 20 Nov 2016 19:58:02 +0100 + + osmium-tool (1.4.0-3~exp1) experimental; urgency=medium + + * Add patch for libosmium 2.10.2 support. + * Bump minimum required libosmium2-dev to 2.10.2. + + -- Bas Couwenberg <[email protected]> Thu, 17 Nov 2016 19:58:08 +0100 + +osmium-tool (1.4.0-2~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <[email protected]> Thu, 22 Sep 2016 07:14:59 +0200 + osmium-tool (1.4.0-2) unstable; urgency=medium * Ignore test failures on problematic architectures. -- 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
