[Pkg-octave-commit] [SCM] octave branch, master, updated. 858202b42a1cc6abe84661f6bf9038eb8a04a388

[Rafael Laboissiere]

tags 532656 pending
thanks

The following commit has been merged in the master branch:
commit 858202b42a1cc6abe84661f6bf9038eb8a04a388
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Mon Jun 15 14:43:45 2009 +0200

    New patch for fixing NaN print problems on mips/mipsel

diff --git a/debian/changelog b/debian/changelog
index 98efb77..9bab6e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+octave3.2 (3.2.0-2) UNRELEASED; urgency=low
+
+  * debian/patches/complex-nan-print.diff: New patch for fixing the
+    problem in mips and mipsel about printing the value of
+    'complex(NaN,0)'.  This was causing the package to FTBFS when running
+    the test of function log2 in data.cc (closes: #532656).
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 15 Jun 2009 12:56:53 +0200
+
 octave3.2 (3.2.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/in/series b/debian/in/series
index 59120eb..dd12f8e 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -13,4 +13,5 @@ datenum-vector-input-any-orientation.diff
 no_pdf_in_print.diff
 dont_set_helvetica-3.1.diff
 normal-markersize.diff
+complex-nan-print.diff
 :]
diff --git a/debian/patches/complex-nan-print.diff b/debian/patches/complex-nan-print.diff
new file mode 100644
index 0000000..7b15849
--- /dev/null
+++ b/debian/patches/complex-nan-print.diff
@@ -0,0 +1,23 @@
+Fix the problem in mips and mipsel about printing the value of
+'complex(NaN,0)'.  This was causing the package to FTBFS when
+running the test of function log2 in data.cc (fixes Bug#532656).
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 15 Jun 2009 12:56:53 +0200
+
+--- a/src/pr-output.cc
++++ b/src/pr-output.cc
+@@ -852,10 +852,12 @@
+   double i_abs = ip < 0.0 ? -ip : ip;
+ 
+   int r_x = r_abs == 0.0
+-    ? 0 : static_cast<int> (floor (log10 (r_abs) + 1.0));
++    ? 0 : ((xisinf (rp) || xisnan (rp))
++	   ? INT_MIN : static_cast<int> (floor (log10 (r_abs) + 1.0)));
+ 
+   int i_x = i_abs == 0.0
+-    ? 0 : static_cast<int> (floor (log10 (i_abs) + 1.0));
++    ? 0 : ((xisinf (ip) || xisnan (ip))
++	   ? INT_MIN : static_cast<int> (floor (log10 (i_abs) + 1.0)));
+ 
+   int x_max, x_min;
+ 

-- 
octave