This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libosmium.
commit d547cad0876d8e7369da46dbaaf1f7df2ead1741 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Aug 29 12:14:17 2015 +0200 Drop patches, applied upstream. --- debian/changelog | 1 + debian/patches/big-endian-crc.patch | 56 ------------------------------- debian/patches/protozero-byte-order.patch | 18 ---------- debian/patches/series | 2 -- 4 files changed, 1 insertion(+), 76 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5cb8a12..5c23e8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libosmium (2.4.0-1) UNRELEASED; urgency=medium * New upstream release. + * Drop patches, applied upstream. -- Bas Couwenberg <sebas...@debian.org> Sat, 29 Aug 2015 12:12:36 +0200 diff --git a/debian/patches/big-endian-crc.patch b/debian/patches/big-endian-crc.patch deleted file mode 100644 index ddb657b..0000000 --- a/debian/patches/big-endian-crc.patch +++ /dev/null @@ -1,56 +0,0 @@ -Description: Disable tests that fail on big endian due to crc mismatches. -Author: Bas Couwenberg <sebas...@debian.org> -Bug: https://github.com/osmcode/libosmium/issues/112 -Forwarded: https://github.com/osmcode/libosmium/pull/113 - ---- a/test/t/basic/test_node.cpp -+++ b/test/t/basic/test_node.cpp -@@ -7,6 +7,8 @@ - - #include "helper.hpp" - -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+ - TEST_CASE("Basic_Node") { - - osmium::CRC<boost::crc_32_type> crc32; -@@ -123,3 +125,5 @@ SECTION("tags") { - - - } -+ -+#endif ---- a/test/t/basic/test_relation.cpp -+++ b/test/t/basic/test_relation.cpp -@@ -7,6 +7,8 @@ - - #include "helper.hpp" - -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+ - TEST_CASE("Build relation") { - - osmium::CRC<boost::crc_32_type> crc32; -@@ -63,3 +65,5 @@ TEST_CASE("Build relation") { - crc32.update(relation); - REQUIRE(crc32().checksum() == 0xebcd836d); - } -+ -+#endif ---- a/test/t/basic/test_way.cpp -+++ b/test/t/basic/test_way.cpp -@@ -8,6 +8,8 @@ - - #include "helper.hpp" - -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+ - TEST_CASE("Build way") { - - osmium::CRC<boost::crc_32_type> crc32; -@@ -88,3 +90,5 @@ SECTION("way_builder_with_helpers") { - } - - } -+ -+#endif diff --git a/debian/patches/protozero-byte-order.patch b/debian/patches/protozero-byte-order.patch deleted file mode 100644 index 2fe7943..0000000 --- a/debian/patches/protozero-byte-order.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Remove leftover check for little endian. - Fixes FTBFS on big endian architectures. -Author: Jochen Topf <joc...@topf.org> -Origin: https://github.com/mapbox/protozero/commit/4bd612677dd53d2a4752332a53db8eb87aed67a4 - ---- a/include/protozero/varint.hpp -+++ b/include/protozero/varint.hpp -@@ -16,10 +16,6 @@ documentation. - * @brief Contains low-level varint and zigzag encoding and decoding functions. - */ - --#if __BYTE_ORDER != __LITTLE_ENDIAN --# error "This code only works on little endian machines." --#endif -- - #include <cstdint> - - #include <protozero/exception.hpp> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2dbefb9..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -protozero-byte-order.patch -big-endian-crc.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.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