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

[Sylvestre Ledru]

The following commit has been merged in the debian-unstable branch:
commit 1b9cc604a64304f995cc92ad57c36711f80b7b0c
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Mon Mar 23 14:12:39 2009 +0100

    +  * Check that _FPU_IEEE is actually available on the platform
    +    (Closes: #520866)

diff --git a/debian/changelog b/debian/changelog
index 1e9adc6..01c0761 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gerris (0.9.2+darcs081022-dfsg.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Check that _FPU_IEEE is actually available on the platform 
+    (Closes: #520866)
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Mon, 23 Mar 2009 14:11:25 +0100
+
 gerris (0.9.2+darcs081022-dfsg.1-2) unstable; urgency=low
 
   * Tighten dependency of libgfs-dev on libgfs-1.3-1 by specifying
diff --git a/debian/patches/fpucontrol-bug350595.patch b/debian/patches/fpucontrol-bug350595.patch
index e0f48b1..4221cc3 100644
--- a/debian/patches/fpucontrol-bug350595.patch
+++ b/debian/patches/fpucontrol-bug350595.patch
@@ -1,8 +1,12 @@
---- src/init.c
-+++ src/init.c
-@@ -22,7 +22,14 @@
+diff --git a/src/init.c b/src/init.c
+index 6d328d4..6fea3e1 100644
+--- a/src/init.c
++++ b/src/init.c
+@@ -21,8 +21,17 @@
+ 
  #ifdef HAVE_FPU_SETCW
  # include <fpu_control.h>
++#ifdef _FPU_IEEE
    static fpu_control_t fpu_trap_exceptions = 
 -       _FPU_IEEE & ~(_FPU_MASK_ZM /*| _FPU_MASK_IM | _FPU_MASK_OM*/);
 +     _FPU_IEEE &
@@ -13,6 +17,7 @@
 +#else
 +     ~(_FPU_MASK_ZM /*| _FPU_MASK_IM | _FPU_MASK_OM*/);
 +#endif
++#endif /* _FPU_IEEE */
  #endif /* HAVE_FPU_SETCW */
  
  #include <stdlib.h>

-- 
Gerris Flow Solver