This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool.
commit bcd246457fd9f2b66c58fe9d8745d85ba0ba4b88 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Tue Aug 18 16:22:19 2015 +0200 Drop patches, fixed upstream. --- debian/changelog | 1 + debian/patches/big-endian-fileinfo-test.patch | 52 --------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 53 deletions(-) diff --git a/debian/changelog b/debian/changelog index d9bb076..bbf7fba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ osmium-tool (1.2.0-1) UNRELEASED; urgency=medium * 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> Tue, 18 Aug 2015 15:53:08 +0200 diff --git a/debian/patches/big-endian-fileinfo-test.patch b/debian/patches/big-endian-fileinfo-test.patch deleted file mode 100644 index 59d7a0f..0000000 --- a/debian/patches/big-endian-fileinfo-test.patch +++ /dev/null @@ -1,52 +0,0 @@ -Description: Fix test failure on big endian architectures. - The CRC checksum is different on big endian architectures like mips, powerpc & s390x. -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://github.com/osmcode/osmium-tool/pull/13 - ---- /dev/null -+++ b/test/fileinfo/fi1-result-be.txt -@@ -0,0 +1,27 @@ -+File: -+ Name: fileinfo/fi1.osm -+ Format: XML -+ Compression: none -+ Size: 438 -+Header: -+ Bounding boxes: -+ With history: no -+ Options: -+ generator=testdata -+ version=0.6 -+Data: -+ Bounding box: (1,1,1,3) -+ Timestamps: -+ First: 2015-01-01T01:00:00Z -+ Last: 2015-01-01T04:00:00Z -+ Objects ordered (by type and id): yes -+ Multiple versions of same object: no -+ CRC32: 1e1e05ec -+ Number of changesets: 0 -+ Number of nodes: 3 -+ Number of ways: 0 -+ Number of relations: 0 -+ Largest changeset ID: 0 -+ Largest node ID: 4 -+ Largest way ID: 0 -+ Largest relation ID: 0 ---- a/test/fileinfo/CMakeLists.txt -+++ b/test/fileinfo/CMakeLists.txt -@@ -12,7 +12,13 @@ endfunction() - - #----------------------------------------------------------------------------- - --check_fileinfo(fi1 "--extended" fi1.osm fi1-result.txt) -+include(TestBigEndian) -+test_big_endian(BIG_ENDIAN) - -+if(${BIG_ENDIAN}) -+ check_fileinfo(fi1 "--extended" fi1.osm fi1-result-be.txt) -+else(${BIG_ENDIAN}) -+ check_fileinfo(fi1 "--extended" fi1.osm fi1-result.txt) -+endif(${BIG_ENDIAN}) - - #----------------------------------------------------------------------------- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e01abe6..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -big-endian-fileinfo-test.patch -- 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