[postgis] 01/03: Drop hppa.patch, fixed upstream.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository postgis.

commit 88544af8657b0f49b3febf08547f4636363f13ef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Mar 23 21:29:24 2016 +0100

    Drop hppa.patch, fixed upstream.
---
 debian/changelog          |  3 ++-
 debian/patches/hppa.patch | 51 -----------------------------------------------
 debian/patches/series     |  1 -
 3 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b345a44..107fa6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 postgis (2.2.2+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Drop patches applied upstream, disable hppa.patch.
+  * Drop patches applied upstream.
+  * Drop hppa.patch, fixed upstream.
   * Update copyright years for Regina Obe & Sandro Santilli.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 23 Mar 2016 01:13:18 +0100
diff --git a/debian/patches/hppa.patch b/debian/patches/hppa.patch
deleted file mode 100644
index ac7823b..0000000
--- a/debian/patches/hppa.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Fix test failure on hppa and mips.
-Author: Helge Deller <deller at gmx.de>
-Bug-Debian: https://bugs.debian.org/810859
-Forwarded: https://trac.osgeo.org/postgis/ticket/3426
-
---- a/liblwgeom/cunit/cu_out_wkb.c
-+++ b/liblwgeom/cunit/cu_out_wkb.c
-@@ -66,6 +66,13 @@ static void cu_wkb(char *wkt)
- }
- 
- 
-+/* parisc and mips (at least some processors) have a different nan representation from other arches. */
-+#if !defined(__hppa__) && !defined(__mips__)
-+# define nan_val( v1, v2)  v1
-+#else
-+# define nan_val( v1, v2)  v2
-+#endif
-+
- static void test_wkb_out_point(void)
- {
- 	cu_wkb("POINT(0 0 0 0)");
-@@ -75,19 +82,24 @@ static void test_wkb_out_point(void)
- 	CU_ASSERT_STRING_EQUAL(s,"0060000001000000043FF00000000000003FF00000000000003FF0000000000000");
- 	
- 	cu_wkb("POINT EMPTY");
--	CU_ASSERT_STRING_EQUAL(s,"00000000017FF80000000000007FF8000000000000");
-+	CU_ASSERT_STRING_EQUAL(s, nan_val("00000000017FF80000000000007FF8000000000000",
-+					  "00000000017FF7FFFFFFFFFFFF7FF7FFFFFFFFFFFF"));
- 
- 	cu_wkb("SRID=4326;POINT EMPTY");
--	CU_ASSERT_STRING_EQUAL(s,"0020000001000010E67FF80000000000007FF8000000000000");
-+	CU_ASSERT_STRING_EQUAL(s, nan_val("0020000001000010E67FF80000000000007FF8000000000000",
-+					  "0020000001000010E67FF7FFFFFFFFFFFF7FF7FFFFFFFFFFFF"));
- 
- 	cu_wkb("POINT Z EMPTY");
--	CU_ASSERT_STRING_EQUAL(s,"00800000017FF80000000000007FF80000000000007FF8000000000000");
-+	CU_ASSERT_STRING_EQUAL(s, nan_val("00800000017FF80000000000007FF80000000000007FF8000000000000",
-+					  "00800000017FF7FFFFFFFFFFFF7FF7FFFFFFFFFFFF7FF7FFFFFFFFFFFF"));
- 
- 	cu_wkb("POINT M EMPTY");
--	CU_ASSERT_STRING_EQUAL(s,"00400000017FF80000000000007FF80000000000007FF8000000000000");
-+	CU_ASSERT_STRING_EQUAL(s, nan_val("00400000017FF80000000000007FF80000000000007FF8000000000000",
-+					  "00400000017FF7FFFFFFFFFFFF7FF7FFFFFFFFFFFF7FF7FFFFFFFFFFFF"));
- 
- 	cu_wkb("POINT ZM EMPTY");
--	CU_ASSERT_STRING_EQUAL(s,"00C00000017FF80000000000007FF80000000000007FF80000000000007FF8000000000000");
-+	CU_ASSERT_STRING_EQUAL(s, nan_val("00C00000017FF80000000000007FF80000000000007FF80000000000007FF8000000000000",
-+					  "00C00000017FF7FFFFFFFFFFFF7FF7FFFFFFFFFFFF7FF7FFFFFFFFFFFF7FF7FFFFFFFFFFFF"));
- }
- 
- static void test_wkb_out_linestring(void)
diff --git a/debian/patches/series b/debian/patches/series
index 3b2e677..32f6ef4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 link-liblwgeom
-#hppa.patch
 relax-test-timing-constraints.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git