[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-3-gb6796f3

[Thomas Weber]

The following commit has been merged in the master branch:
commit d7ffbfd54343daa67f246cf5b4903f4fd18e110b
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Tue Oct 6 20:02:52 2009 +0200

    Remove complex-nan-print.diff and dont_pass_ldflags_to_magickconfig
    
    They are applied in 3.2.3 upstream.

diff --git a/debian/changelog b/debian/changelog
index 2281f37..4d7dbb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-octave3.2 (3.2.2-3) UNRELEASED; urgency=low
+octave3.2 (3.2.3-1) UNRELEASED; urgency=low
 
+  * New upstream release
   * Change build-dependency on libreadline, as per
     http://lists.debian.org/debian-devel/2009/09/msg00562.html 
+  * Dropped patches (applied upstream):
+    - complex-nan-print.diff
+    - dont_pass_ldflags_to_magickconfig
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 15 Sep 2009 08:45:00 +0200
 
diff --git a/debian/in/series b/debian/in/series
index b8bec8a..59120eb 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -13,6 +13,4 @@ datenum-vector-input-any-orientation.diff
 no_pdf_in_print.diff
 dont_set_helvetica-3.1.diff
 normal-markersize.diff
-complex-nan-print.diff
-dont_pass_ldflags_to_magickconfig
 :]
diff --git a/debian/patches/complex-nan-print.diff b/debian/patches/complex-nan-print.diff
deleted file mode 100644
index 98e8885..0000000
--- a/debian/patches/complex-nan-print.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-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
-@@ -853,10 +853,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;
- 
diff --git a/debian/patches/dont_pass_ldflags_to_magickconfig b/debian/patches/dont_pass_ldflags_to_magickconfig
deleted file mode 100644
index 582c6f4..0000000
--- a/debian/patches/dont_pass_ldflags_to_magickconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-magickconfig includes a -pie switch in its ldflags, which is a problem
-Patch taken from upstream (db08c2376970), bug fix for 535080
---- a/Makeconf.in
-+++ b/Makeconf.in
-@@ -153,7 +153,7 @@
- 
- MAGICK_CONFIG = @MAGICK_CONFIG@
- MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags)
--MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --ldflags --libs)
-+MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --libs)
- 
- LIBFLAGS = -L$(TOPDIR)
- 

-- 
octave