[osmium-tool] 01/02: Merge tag 'debian/1.1.1-2' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Jul 27 10:57:19 UTC 2015
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 0dfde690ae45aa3a34fc6b7e561fdb31bb7bfeb8
Merge: c289c9a a6845d3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Jul 27 12:25:27 2015 +0200
Merge tag 'debian/1.1.1-2' into jessie-backports
Conflicts:
debian/changelog
.travis.yml | 77 +-
.ycm_extra_conf.py | 2 +
CHANGELOG.md | 46 +-
CMakeLists.txt | 44 +-
LICENSE-rapidjson.txt | 57 +
appveyor.yml | 42 +-
cmake/FindOsmium.cmake | 2 +-
cmake/run_test_compare_output.cmake | 66 +
debian/changelog | 16 +
debian/control | 2 +-
debian/copyright | 54 +
debian/patches/big-endian-fileinfo-test.patch | 52 +
debian/patches/reproducible-build.patch | 17 -
debian/patches/series | 2 +-
debian/source.lintian-overrides | 3 +
include/rapidjson/allocators.h | 261 +++
include/rapidjson/document.h | 2039 ++++++++++++++++++++
include/rapidjson/encodedstream.h | 261 +++
include/rapidjson/encodings.h | 625 ++++++
include/rapidjson/error/en.h | 65 +
include/rapidjson/error/error.h | 146 ++
include/rapidjson/filereadstream.h | 88 +
include/rapidjson/filewritestream.h | 91 +
include/rapidjson/internal/biginteger.h | 280 +++
include/rapidjson/internal/diyfp.h | 247 +++
include/rapidjson/internal/dtoa.h | 217 +++
include/rapidjson/internal/ieee754.h | 77 +
include/rapidjson/internal/itoa.h | 304 +++
include/rapidjson/internal/meta.h | 181 ++
include/rapidjson/internal/pow10.h | 55 +
include/rapidjson/internal/stack.h | 179 ++
include/rapidjson/internal/strfunc.h | 39 +
include/rapidjson/internal/strtod.h | 270 +++
include/rapidjson/memorybuffer.h | 70 +
include/rapidjson/memorystream.h | 61 +
include/rapidjson/msinttypes/inttypes.h | 316 +++
include/rapidjson/msinttypes/stdint.h | 300 +++
include/rapidjson/pointer.h | 1313 +++++++++++++
include/rapidjson/prettywriter.h | 207 ++
include/rapidjson/rapidjson.h | 654 +++++++
include/rapidjson/reader.h | 1452 ++++++++++++++
include/rapidjson/stringbuffer.h | 93 +
include/rapidjson/writer.h | 395 ++++
man/manpage.template | 3 +-
man/osmium-check-refs.md | 65 +
man/osmium-fileinfo.md | 61 +-
man/osmium-getid.md | 65 +
man/osmium-renumber.md | 102 +
scripts/travis_install.sh | 15 +
scripts/travis_script.sh | 31 +
src/command_apply_changes.cpp | 159 +-
src/command_apply_changes.hpp | 15 +-
src/command_cat.cpp | 144 +-
src/command_cat.hpp | 14 +-
src/command_check_refs.cpp | 269 +++
...command_fileinfo.hpp => command_check_refs.hpp} | 22 +-
src/command_fileinfo.cpp | 577 +++++-
src/command_fileinfo.hpp | 9 +-
src/command_getid.cpp | 187 ++
src/{command_fileinfo.hpp => command_getid.hpp} | 27 +-
src/command_help.cpp | 35 +-
src/command_merge_changes.cpp | 107 +-
src/command_merge_changes.hpp | 16 +-
src/command_renumber.cpp | 244 +++
src/command_renumber.hpp | 76 +
src/command_time_filter.cpp | 146 +-
src/command_time_filter.hpp | 17 +-
src/main.cpp | 11 +-
src/osmc.hpp | 199 +-
test/CMakeLists.txt | 57 +
test/cat/CMakeLists.txt | 19 +
test/cat/input1.osm | 6 +
test/cat/input2.osm | 6 +
test/cat/output-cat12.osm | 9 +
test/cat/output-cat21.osm | 9 +
test/check-refs/CMakeLists.txt | 13 +
test/check-refs/nw-okay.osm | 15 +
test/check-refs/nwr-okay.osm | 15 +
test/fileinfo/CMakeLists.txt | 18 +
test/fileinfo/fi1-result.txt | 27 +
test/fileinfo/fi1.osm | 6 +
test/getid/CMakeLists.txt | 15 +
test/getid/input.osm | 22 +
test/getid/output.osm | 10 +
test/help/CMakeLists.txt | 18 +
test/renumber/CMakeLists.txt | 28 +
test/renumber/input-change.osc | 19 +
test/renumber/input-sorted.osm | 22 +
test/renumber/output-change.osc | 19 +
test/renumber/output-sorted.osm | 22 +
test/time-filter/CMakeLists.txt | 31 +
test/time-filter/input.osh | 15 +
test/time-filter/output-last.osm | 5 +
test/time-filter/output-range-0-5.osh | 13 +
test/time-filter/output-range-1-2.osh | 6 +
test/time-filter/output-range-1a-2a.osh | 10 +
test/time-filter/output-range-2-3.osh | 7 +
test/time-filter/output-range-2-3a.osh | 9 +
test/time-filter/output-range-2-4.osh | 9 +
test/time-filter/output-ts1.osm | 6 +
test/time-filter/output-ts2.osm | 6 +
test/time-filter/output-ts3.osm | 6 +
zsh_completion/_osmium | 152 +-
103 files changed, 13313 insertions(+), 721 deletions(-)
diff --cc debian/changelog
index 6b312db,77d3175..4c7eab9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,19 +1,26 @@@
+ osmium-tool (1.1.1-2) unstable; urgency=medium
+
+ * Add patch to fix test failure on big endian architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 21 Jul 2015 21:56:07 +0200
+
+ osmium-tool (1.1.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Add license & copyright for RapidJSON includes.
+ * Drop reproducible-build.patch, fixed upstream.
+ * Require at least libosmium version 2.2.0.
+ * Add lintian override for license-problem-json-evil false positive.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 21 Jul 2015 07:43:37 +0200
+
+osmium-tool (1.0.1-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Update branch in gbp.conf and Vcs-Git URL.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 03 Jul 2015 19:00:44 +0200
+
osmium-tool (1.0.1-2) unstable; urgency=medium
* Add patch by Chris Lamb for reproducible build.
--
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