[Pkg-octave-commit] [SCM] octave branch, octave3.2, updated. 3d6b62c7f922a903159c00374a963dd9dbd3dda8

[Rafael Laboissiere]

The following commit has been merged in the octave3.2 branch:
commit 301b37455f9c2a3fa3184e2c958f1ef4f55516d3
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Wed May 27 14:09:56 2009 +0200

    Adjust patches for new RC release

diff --git a/debian/patches/dont_set_helvetica-3.1.diff b/debian/patches/dont_set_helvetica-3.1.diff
index 1109b92..55c588e 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
-@@ -1700,7 +1700,7 @@
+@@ -1706,7 +1706,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
-@@ -1738,7 +1738,7 @@
+@@ -1744,7 +1744,7 @@
    if (strcmp (fld, "string"))
      [f, s, fnt, it, bld] = get_fontname_and_size (obj);
    else
diff --git a/debian/patches/normal-markersize.diff b/debian/patches/normal-markersize.diff
index a48c31d..80aab59 100644
--- a/debian/patches/normal-markersize.diff
+++ b/debian/patches/normal-markersize.diff
@@ -14,7 +14,7 @@ Francesco Potorti for the patch.
  	     endif
  
               if (isfield (obj, "edgecolor"))
-@@ -1444,7 +1444,7 @@
+@@ -1450,7 +1450,7 @@
      endif
  
      if (isfield (obj, "markersize"))

-- 
octave