[SCM] Gerris Flow Solver branch, debian-unstable, updated. gerris-0.9.2+darcs081022-dfsg.1-3-1-gdf4cdd1

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit df4cdd1e60ea5e2ca578ce48cee6bc484083989a
Author: Drew Parsons <dparsons at debian.org>
Date:   Sat Apr 11 01:05:49 2009 +1000

    Check for _FPU_IEEE when fpu_trap_exception is used.
    
    Update fpucontrol-bug350595.patch to add extra check for _FPU_IEEE
    at point where fpu_trap_exception is used. For consistency with
    definition of fpu_trap_exception (first part of the patch).
    
    Required for building on s390.

diff --git a/debian/changelog b/debian/changelog
index 27ddfe9..72bc6da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gerris (0.9.2+darcs081022-dfsg.1-4) UNRELEASED; urgency=low
+
+  * Update fpucontrol-bug350595.patch to add extra check for _FPU_IEEE
+    at point where fpu_trap_exception is used.
+
+ -- Drew Parsons <dparsons at debian.org>  Sat, 11 Apr 2009 01:03:29 +1000
+
 gerris (0.9.2+darcs081022-dfsg.1-3) unstable; urgency=low
 
   [ Sylvestre Ledru ]
diff --git a/debian/patches/fpucontrol-bug350595.patch b/debian/patches/fpucontrol-bug350595.patch
index 4221cc3..751c01b 100644
--- a/debian/patches/fpucontrol-bug350595.patch
+++ b/debian/patches/fpucontrol-bug350595.patch
@@ -1,7 +1,8 @@
 diff --git a/src/init.c b/src/init.c
 index 6d328d4..6fea3e1 100644
---- a/src/init.c
-+++ b/src/init.c
+diff -Nur -x '*.orig' -x '*~' gerris/src/init.c gerris.new/src/init.c
+--- gerris/src/init.c	2009-01-17 23:25:56.000000000 +1100
++++ gerris.new/src/init.c	2009-04-11 01:02:03.000000000 +1000
 @@ -21,8 +21,17 @@
  
  #ifdef HAVE_FPU_SETCW
@@ -21,3 +22,13 @@ index 6d328d4..6fea3e1 100644
  #endif /* HAVE_FPU_SETCW */
  
  #include <stdlib.h>
+@@ -261,7 +270,9 @@
+   initialized = TRUE;
+ 
+ #ifdef HAVE_FPU_SETCW
++#ifdef _FPU_IEEE
+    _FPU_SETCW (fpu_trap_exceptions);
++#endif /* _FPU_IEEE */
+ #endif /* HAVE_FPU_SETCW */
+ 
+   g_log_set_handler (G_LOG_DOMAIN,

-- 
Gerris Flow Solver