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 3e157152af2b909f11ce99e35f4351f9a22bf182
Merge: 336a8b9 d86f9a7
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Thu Sep 22 07:14:45 2016 +0200
Merge tag 'debian/1.4.0-2' into jessie-backports
Conflicts:
debian/changelog
debian/control
.gitignore | 2 +
.travis.yml | 98 +-
.ycm_extra_conf.py | 7 +
CHANGELOG.md | 39 +-
CMakeLists.txt | 71 +-
CONTRIBUTING.md | 8 +
README.md | 66 +-
appveyor.yml | 60 +-
build-appveyor.bat | 110 +
build-local.bat | 43 +
debian/changelog | 20 +
debian/control | 4 +-
debian/copyright | 7 +-
debian/docs | 1 +
debian/patches/output-typo.patch | 16 -
debian/patches/series | 2 +-
debian/patches/spelling-errors.patch | 47 +
debian/rules | 10 +
doc/manual.md | 495 +++
doc/osmium-show.png | Bin 0 -> 51357 bytes
include/rapidjson/allocators.h | 532 +--
include/rapidjson/document.h | 4614 +++++++++++---------
include/rapidjson/encodedstream.h | 560 +--
include/rapidjson/encodings.h | 1341 +++---
include/rapidjson/error/en.h | 21 +-
include/rapidjson/error/error.h | 17 +-
include/rapidjson/filereadstream.h | 187 +-
include/rapidjson/filewritestream.h | 195 +-
include/rapidjson/fwd.h | 151 +
include/rapidjson/internal/biginteger.h | 14 +-
include/rapidjson/internal/diyfp.h | 17 +-
include/rapidjson/internal/dtoa.h | 50 +-
include/rapidjson/internal/ieee754.h | 3 +-
include/rapidjson/internal/meta.h | 362 +-
include/rapidjson/internal/pow10.h | 110 +-
include/rapidjson/internal/regex.h | 701 +++
include/rapidjson/internal/stack.h | 409 +-
include/rapidjson/internal/strfunc.h | 94 +-
include/rapidjson/internal/strtod.h | 33 +-
include/rapidjson/internal/{strfunc.h => swap.h} | 85 +-
include/rapidjson/istreamwrapper.h | 115 +
include/rapidjson/memorybuffer.h | 2 +-
include/rapidjson/memorystream.h | 16 +-
include/rapidjson/msinttypes/stdint.h | 8 +-
include/rapidjson/ostreamwrapper.h | 81 +
include/rapidjson/pointer.h | 119 +-
include/rapidjson/prettywriter.h | 462 +-
include/rapidjson/rapidjson.h | 1269 +++---
include/rapidjson/reader.h | 3331 ++++++++------
include/rapidjson/schema.h | 2006 +++++++++
include/rapidjson/stream.h | 179 +
include/rapidjson/stringbuffer.h | 210 +-
include/rapidjson/writer.h | 1005 +++--
iwyu.imp | 19 +
man/manpage.template | 4 +-
man/osmium-add-locations-to-ways.md | 1 +
man/osmium-apply-changes.md | 31 +-
man/osmium-cat.md | 1 +
man/osmium-changeset-filter.md | 1 +
man/osmium-check-refs.md | 1 +
man/osmium-derive-changes.md | 90 +
man/osmium-diff.md | 112 +
man/osmium-file-formats.md | 12 +-
man/osmium-fileinfo.md | 1 +
man/osmium-getid.md | 16 +-
man/osmium-merge-changes.md | 2 +-
man/osmium-merge.md | 63 +
man/osmium-renumber.md | 25 +-
man/osmium.md | 12 +
man/progress-options.md | 13 +
osmium-wrapper.in | 2 +-
src/CMakeLists.txt | 2 +-
src/cmd.cpp | 81 +-
src/cmd.hpp | 40 +-
src/cmd_factory.cpp | 9 +-
src/command_add_locations_to_ways.cpp | 43 +-
src/command_add_locations_to_ways.hpp | 27 +-
src/command_apply_changes.cpp | 102 +-
src/command_apply_changes.hpp | 9 +-
src/command_cat.cpp | 50 +-
src/command_cat.hpp | 9 +-
src/command_changeset_filter.cpp | 50 +-
src/command_changeset_filter.hpp | 6 +-
src/command_check_refs.cpp | 46 +-
src/command_check_refs.hpp | 5 +-
src/command_derive_changes.cpp | 186 +
...pply_changes.hpp => command_derive_changes.hpp} | 31 +-
src/command_diff.cpp | 346 ++
src/{command_sort.hpp => command_diff.hpp} | 22 +-
src/command_fileinfo.cpp | 65 +-
src/command_fileinfo.hpp | 7 +-
src/command_getid.cpp | 79 +-
src/command_getid.hpp | 6 +-
src/command_help.cpp | 11 +-
src/command_help.hpp | 7 +-
src/command_merge.cpp | 220 +
src/{command_sort.hpp => command_merge.hpp} | 22 +-
src/command_merge_changes.cpp | 23 +-
src/command_merge_changes.hpp | 4 +-
src/command_renumber.cpp | 130 +-
src/command_renumber.hpp | 8 +-
src/command_show.cpp | 42 +-
src/command_show.hpp | 4 +-
src/command_sort.cpp | 23 +-
src/command_sort.hpp | 4 +-
src/command_time_filter.cpp | 50 +-
src/command_time_filter.hpp | 4 +-
src/exception.hpp | 6 +-
src/io.cpp | 35 +-
src/main.cpp | 27 +-
src/version.cpp.in | 15 +
test/CMakeLists.txt | 6 +-
test/apply-changes/CMakeLists.txt | 14 +-
.../{simplified.osm => input-history.osh} | 13 +-
.../{simplified.osm => input-history.osm} | 13 +-
.../{simplified.osm => output-data.osm} | 0
.../{output.osh => output-history.osh} | 1 +
test/cat/CMakeLists.txt | 4 +-
test/cat/test_setup.cpp | 2 +-
test/derive-changes/CMakeLists.txt | 18 +
.../simplified.osm => derive-changes/input1.osm} | 14 +-
.../simplified.osm => derive-changes/input2.osm} | 0
test/derive-changes/output-incr-version.osc | 19 +
test/derive-changes/output-keep-details.osc | 21 +
test/derive-changes/output.osc | 19 +
test/diff/CMakeLists.txt | 26 +
.../simplified.osm => diff/input1.osm} | 14 +-
.../simplified.osm => diff/input2.osm} | 2 +
test/diff/output-c.opl | 10 +
test/diff/output-compact | 12 +
test/diff/output-compact-c | 8 +
test/diff/output.opl | 14 +
test/diff/test_setup.cpp | 43 +
test/include/catch.hpp | 622 ++-
test/merge/CMakeLists.txt | 30 +
test/merge/input1.osm | 23 +
test/merge/input2.osm | 22 +
test/merge/input3.osm | 16 +
test/merge/output1.osm | 23 +
test/merge/output2.osm | 41 +
test/merge/output3.osm | 54 +
test/misc/CMakeLists.txt | 4 +-
test/renumber/CMakeLists.txt | 5 +
test/renumber/output-sorted-n.osm | 23 +
test/time-filter/test_setup.cpp | 2 +-
test/unit_tests.cpp | 2 +-
zsh_completion/_osmium | 160 +-
147 files changed, 15423 insertions(+), 7544 deletions(-)
diff --cc debian/changelog
index 11dd68c,655b8ba..7c559b0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,29 @@@
+ osmium-tool (1.4.0-2) unstable; urgency=medium
+
+ * Ignore test failures on problematic architectures.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 16 Sep 2016 20:25:16 +0200
+
+ osmium-tool (1.4.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update Homepage URL.
+ * Include CONTRIBUTING.md in docs.
+ * Update copyright file, changes:
+ - Rename MIT license shortname to Expat
+ - Add THL A29 Limited to copyright holders for msinttypes files
+ * Bump minimum required libosmium2-dev to 2.9.0.
+ * Drop output-typo.patch, applied upstream.
+ * Add patch to fix spelling errors.
+
+ -- Bas Couwenberg <sebas...@debian.org> Thu, 15 Sep 2016 16:35:18 +0200
+
+osmium-tool (1.3.1-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sun, 14 Aug 2016 12:07:07 +0200
+
osmium-tool (1.3.1-2) unstable; urgency=medium
* Rebuild with libosmium 2.8.0, for long strings overflow fix.
diff --cc debian/control
index ab77288,5337628..2e91557
--- a/debian/control
+++ b/debian/control
@@@ -14,8 -14,8 +14,8 @@@ Build-Depends: debhelper (>= 9)
zlib1g-dev
Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmium-tool.git/
-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/
+ Homepage: http://osmcode.org/osmium-tool/
Package: osmium-tool
Architecture: any
--
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
