[SCM] postgis branch, master, updated. upstream/2.0.1-62-gd2b9e25

Markus Wanner markus at bluegap.ch
Fri Jul 19 23:12:15 UTC 2013


The following commit has been merged in the master branch:
commit d2b9e258385c3114a172ceed4b22cd2998a49152
Author: Markus Wanner <markus at bluegap.ch>
Date:   Sat Jul 20 01:10:20 2013 +0200

    Add fix-test-case-for-i386 patch, back-ported from upstream's
    r10642. Fixes tests on i386 (and possibly other non-amd64
    architectures).

diff --git a/debian/changelog b/debian/changelog
index 60a451d..dd00df7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 postgis (2.0.3-3) UNRELEASED; urgency=low
 
   [Mònica Ramírez Arceda]
-  * Add a manpage to shp2pgsql-gui. Closes: #656012.
+  * Add a manpage for shp2pgsql-gui. Closes: #656012.
+
+  [Markus Wanner]
+  * Add fix-test-case-for-i386 patch, back-ported from upstream's
+    r10642. Fixes tests on i386 (and possibly other non-amd64
+    architectures).
 
  -- Markus Wanner <markus at bluegap.ch>  Fri, 19 Jul 2013 10:59:47 +0200
 
diff --git a/debian/patches/fix-test-case-for-i386 b/debian/patches/fix-test-case-for-i386
new file mode 100644
index 0000000..805c70d
--- /dev/null
+++ b/debian/patches/fix-test-case-for-i386
@@ -0,0 +1,18 @@
+Description: sanitize test case for architectures other than amd64
+ Stop penalizing windows 9.2 32-bit when it gives a stupid answer to
+ an ill-defined question. Change to be a well-defined question.
+Author: Regina Obe <lr at pcorp.us>
+Last-Update: 2013-07-10
+Origin: http://trac.osgeo.org/postgis/changeset/10642
+
+--- a/regress/lwgeom_regress.sql
++++ b/regress/lwgeom_regress.sql
+@@ -92,7 +92,7 @@
+ 
+ 
+ SELECT ST_extent(geometry(wkb_ndr)) from test_data;
+-SELECT ST_3DExtent(geometry(wkb_ndr)) from test_data;
++SELECT ST_3DExtent(geometry(wkb_ndr)) from test_data WHERE ST_NDims(wkb_ndr) > 2;
+ SELECT ST_mem_size(ST_collect(ST_force_2d(geometry(wkb_ndr)))) from test_data;
+ SELECT ST_mem_size(ST_collect(ST_force_3dz(geometry(wkb_ndr)))) from test_data;
+ SELECT ST_mem_size(ST_collect(ST_force_4d(ST_force_2d(geometry(wkb_ndr))))) from test_data;
diff --git a/debian/patches/series b/debian/patches/series
index 4769335..d760310 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ link-liblwgeom
 use-debian-maven
 fix-manpages
 honor-build-flags
+fix-test-case-for-i386

-- 
PostGIS for PostgreSQL



More information about the Pkg-grass-devel mailing list