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 6de90f5932aeadec1435baab41f3979c2a23307a
Merge: d873cc5 b8ab350
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Tue Sep 8 08:32:07 2015 +0200
Merge tag 'debian/1.2.1-2' into jessie-backports
Conflicts:
debian/changelog
debian/control
.travis.yml | 9 +-
CHANGELOG.md | 39 +-
CMakeLists.txt | 4 +-
LICENSE-rapidjson.txt | 24 -
README.md | 20 +-
appveyor.yml | 23 +-
cmake/FindOSMPBF.cmake | 50 -
cmake/FindOsmium.cmake | 77 +-
cmake/run_test_compare_output.cmake | 37 +-
debian/changelog | 32 +
debian/control | 7 +-
debian/copyright | 29 +
debian/patches/big-endian-fileinfo-test.patch | 52 -
debian/patches/series | 1 -
debian/source.lintian-overrides | 3 -
man/manpage.template | 1 +
man/osmium-apply-changes.md | 36 +-
man/osmium-cat.md | 15 +-
man/osmium-check-refs.md | 13 +-
man/osmium-file-formats.md | 2 +-
man/osmium-fileinfo.md | 32 +-
man/osmium-getid.md | 19 +-
man/osmium-merge-changes.md | 24 +-
man/osmium-renumber.md | 21 +-
man/osmium-time-filter.md | 19 +-
man/osmium.md | 33 +-
scripts/travis_install.sh | 15 -
scripts/travis_script.sh | 9 +-
src/{osmc.hpp => cmd.hpp} | 164 +-
src/cmd_factory.cpp | 74 +
src/command_apply_changes.hpp | 4 +-
src/command_cat.cpp | 57 +-
src/command_cat.hpp | 11 +-
src/command_check_refs.hpp | 4 +-
src/command_fileinfo.cpp | 45 +-
src/command_fileinfo.hpp | 4 +-
src/command_getid.cpp | 24 +-
src/command_getid.hpp | 8 +-
src/command_help.cpp | 27 +-
src/command_help.hpp | 2 +-
src/command_merge_changes.hpp | 4 +-
src/command_renumber.cpp | 122 +-
src/command_renumber.hpp | 5 +-
src/command_time_filter.cpp | 1 +
src/command_time_filter.hpp | 4 +-
src/{command_help.hpp => exception.hpp} | 27 +-
src/io.cpp | 121 +
src/main.cpp | 33 +-
test/CMakeLists.txt | 66 +-
test/apply-changes/CMakeLists.txt | 17 +
test/{renumber => apply-changes}/input-change.osc | 10 +-
.../input-data.osm} | 0
test/apply-changes/output.osh | 30 +
.../simplified.osm} | 12 +-
test/cat/CMakeLists.txt | 9 +-
test/cat/output1.osm.opl | 3 +
test/cat/test_setup.cpp | 80 +
test/fileinfo/CMakeLists.txt | 2 +-
test/fileinfo/fi1-result.txt | 4 +-
test/formats/CMakeLists.txt | 58 +
test/formats/empty-nocompression.osm.pbf | Bin 0 -> 54 bytes
test/formats/empty-nodensenodes-nometadata.osm.pbf | Bin 0 -> 52 bytes
test/formats/empty-nodensenodes.osm.pbf | Bin 0 -> 52 bytes
test/formats/empty-nometadata.osm.pbf | Bin 0 -> 64 bytes
test/formats/empty.osm | 3 +
test/formats/empty.osm.opl | 0
test/formats/empty.osm.pbf | Bin 0 -> 64 bytes
test/formats/f1-nocompression.osm.pbf | Bin 0 -> 388 bytes
test/formats/f1-nodensenodes-nometadata.osm.pbf | Bin 0 -> 289 bytes
test/formats/f1-nodensenodes.osm.pbf | Bin 0 -> 402 bytes
test/formats/f1-nometadata.osm.pbf | Bin 0 -> 299 bytes
test/{renumber/input-sorted.osm => formats/f1.osm} | 21 +-
test/formats/f1.osm.opl | 7 +
test/formats/f1.osm.pbf | Bin 0 -> 404 bytes
test/getid/CMakeLists.txt | 2 +-
test/help/CMakeLists.txt | 9 +-
test/include/catch.hpp | 9416 ++++++++++++++++++++
test/include/test.hpp | 4 +
test/io/Makefile.in | 280 +
test/{renumber/input-sorted.osm => io/input.osm} | 8 +-
test/merge-changes/CMakeLists.txt | 17 +
test/merge-changes/change1.osc | 24 +
.../input-change.osc => merge-changes/change2.osc} | 10 +-
test/merge-changes/merged.osc | 44 +
test/merge-changes/simplified.osc | 37 +
test/{getid => misc}/CMakeLists.txt | 10 +-
test/renumber/CMakeLists.txt | 11 +-
test/renumber/input-change.osc | 2 +-
test/renumber/input-sorted.osm | 5 +-
test/renumber/output-change.osc | 4 +-
test/renumber/output-sorted.osm | 1 +
test/time-filter/CMakeLists.txt | 2 +-
test/time-filter/test_setup.cpp | 15 +
test/unit_tests.cpp | 2 +
94 files changed, 10920 insertions(+), 692 deletions(-)
diff --cc debian/changelog
index 8901afa,2018047..1e5f65d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,35 +1,41 @@@
+ osmium-tool (1.2.1-2) unstable; urgency=medium
+
+ * Don't ignore test failures any more, all fixed upstream.
+
+ -- Bas Couwenberg <sebas...@debian.org> Wed, 02 Sep 2015 16:53:52 +0200
+
+ osmium-tool (1.2.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump minimum required libosmium2-dev to 2.4.1.
+ * Update Vcs-Browser URL to use HTTPS.
+ * Drop big-endian-fileinfo-test.patch, fixed upstream.
+
+ -- Bas Couwenberg <sebas...@debian.org> Mon, 31 Aug 2015 16:15:53 +0200
+
+ osmium-tool (1.2.0-2) unstable; urgency=medium
+
+ * Restore big-endian-fileinfo-test.patch, not fixed upstream.
+ * Ignore test failures to not fail the entire build.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sun, 23 Aug 2015 11:55:32 +0200
+
+ osmium-tool (1.2.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop build dependencies on osmpbf & protobuf.
+ * Bump minimum required libosmium2-dev to 2.3.0.
+ * Update copyright file, add license & copyright for catch.hpp.
+ * Drop patches, fixed upstream.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 21 Aug 2015 21:05:48 +0200
+
+osmium-tool (1.1.1-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebas...@debian.org> Mon, 27 Jul 2015 12:25:32 +0200
+
osmium-tool (1.1.1-2) unstable; urgency=medium
* Add patch to fix test failure on big endian architectures.
diff --cc debian/control
index 16b545c,90cc168..b68dacc
--- a/debian/control
+++ b/debian/control
@@@ -16,8 -13,8 +13,8 @@@ Build-Depends: debhelper (>= 9)
pandoc,
zlib1g-dev
Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/osmium-tool.git/
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmium-tool.git/
-Vcs-Git: git://anonscm.debian.org/pkg-grass/osmium-tool.git
+Vcs-Git: git://anonscm.debian.org/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
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
