[Pkg-octave-commit] [SCM] octave branch, master, updated. 2ecbaa0375353921ac971b4af5a29887b828a0e1

[Thomas Weber]

The following commit has been merged in the master branch:
commit aa6790e54d2a975e76e6e9f32a9420e4c48b07d9
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sun Jul 26 16:43:44 2009 +0200

    Refresh patches for Octave 3.2.2

diff --git a/debian/patches/complex-nan-print.diff b/debian/patches/complex-nan-print.diff
index 7b15849..98e8885 100644
--- a/debian/patches/complex-nan-print.diff
+++ b/debian/patches/complex-nan-print.diff
@@ -6,7 +6,7 @@ running the test of function log2 in data.cc (fixes Bug#532656).
 
 --- a/src/pr-output.cc
 +++ b/src/pr-output.cc
-@@ -852,10 +852,12 @@
+@@ -853,10 +853,12 @@
    double i_abs = ip < 0.0 ? -ip : ip;
  
    int r_x = r_abs == 0.0
diff --git a/debian/patches/dont_set_helvetica-3.1.diff b/debian/patches/dont_set_helvetica-3.1.diff
index 1a35981..62297c9 100644
--- a/debian/patches/dont_set_helvetica-3.1.diff
+++ b/debian/patches/dont_set_helvetica-3.1.diff
@@ -5,7 +5,7 @@ font. Fixes Bug#477688.
 
 --- a/scripts/plot/__go_draw_axes__.m
 +++ b/scripts/plot/__go_draw_axes__.m
-@@ -1719,7 +1719,7 @@
+@@ -1751,7 +1751,7 @@
  
  function [f, s, fnt, it, bld] = get_fontname_and_size (t)
    if (isempty (t.fontname))
@@ -14,7 +14,7 @@ font. Fixes Bug#477688.
    else
      fnt = t.fontname;
    endif
-@@ -1757,7 +1757,7 @@
+@@ -1789,7 +1789,7 @@
    if (strcmp (fld, "string"))
      [f, s, fnt, it, bld] = get_fontname_and_size (obj);
    else
diff --git a/debian/patches/no_pdf_in_print.diff b/debian/patches/no_pdf_in_print.diff
index 9db1964..6d50439 100644
--- a/debian/patches/no_pdf_in_print.diff
+++ b/debian/patches/no_pdf_in_print.diff
@@ -5,7 +5,7 @@ missing pdflib (closes: #478677)
 
 --- a/scripts/plot/print.m
 +++ b/scripts/plot/print.m
-@@ -101,6 +101,9 @@
+@@ -103,6 +103,9 @@
  ##     Scalable vector graphics
  ##   @item pdf
  ##     Portable document format
diff --git a/debian/patches/normal-markersize.diff b/debian/patches/normal-markersize.diff
index 0e2936c..b263498 100644
--- a/debian/patches/normal-markersize.diff
+++ b/debian/patches/normal-markersize.diff
@@ -5,7 +5,7 @@ Francesco Potorti for the patch.
 
 --- a/scripts/plot/__go_draw_axes__.m
 +++ b/scripts/plot/__go_draw_axes__.m
-@@ -674,7 +674,7 @@
+@@ -689,7 +689,7 @@
  	     usingclause{data_idx} = sprintf ("record=%d", numel (obj.xdata));
  
  	     if (isfield (obj, "markersize"))
@@ -14,7 +14,7 @@ Francesco Potorti for the patch.
  	     endif
  
               if (isfield (obj, "edgecolor"))
-@@ -1456,7 +1456,7 @@
+@@ -1471,7 +1471,7 @@
      endif
  
      if (isfield (obj, "markersize"))

-- 
octave