[Pkg-octave-commit] [SCM] octave branch, octave3.2, updated. 70c076c5bc3455b52bbe2c706340cfa970a334f7

[Rafael Laboissiere]

The following commit has been merged in the octave3.2 branch:
commit 70c076c5bc3455b52bbe2c706340cfa970a334f7
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Tue May 26 13:22:29 2009 +0200

    Adjusted the patches for the new upstream version
    
    Essentially, only the offsets have been adjusted. This was done by
    semi-automatically running quilt push/refresh. Quilt is great!

diff --git a/debian/patches/50_octave-bug-tempfile.diff b/debian/patches/50_octave-bug-tempfile.diff
index fb89740..306966f 100644
--- a/debian/patches/50_octave-bug-tempfile.diff
+++ b/debian/patches/50_octave-bug-tempfile.diff
@@ -6,9 +6,9 @@ Use Debian's tempfile(1) for enhanced security
 
  -- Rafael Laboissiere <rafael at debian.org>  Mon, 28 Aug 2006 21:23:33 +0200
 
---- octave2.1-2.1.73.orig/octave-bug.in	2006-08-19 02:58:39.000000000 +0200
-+++ octave2.1-2.1.73/octave-bug.in	2006-08-19 11:11:51.172397104 +0200
-@@ -60,7 +60,7 @@
+--- a/octave-bug.in
++++ b/octave-bug.in
+@@ -71,7 +71,7 @@
  PATH=/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH
  export PATH
  
diff --git a/debian/patches/dont_set_helvetica-3.1.diff b/debian/patches/dont_set_helvetica-3.1.diff
index 5e4e981..1109b92 100644
--- a/debian/patches/dont_set_helvetica-3.1.diff
+++ b/debian/patches/dont_set_helvetica-3.1.diff
@@ -3,10 +3,9 @@ font. Fixes Bug#477688.
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat, 19 Jul 2008 10:27:26 +0200
 
-diff -urNad octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m
---- octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m	2008-04-21 18:00:20.000000000 +0200
-+++ octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m	2008-05-25 17:30:08.000000000 +0200
-@@ -1619,7 +1619,7 @@
+--- a/scripts/plot/__go_draw_axes__.m
++++ b/scripts/plot/__go_draw_axes__.m
+@@ -1700,7 +1700,7 @@
  
  function [f, s, fnt, it, bld] = get_fontname_and_size (t)
    if (isempty (t.fontname))
@@ -15,7 +14,7 @@ diff -urNad octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m octave3.0-3.0.1/scr
    else
      fnt = t.fontname;
    endif
-@@ -1657,7 +1657,7 @@
+@@ -1738,7 +1738,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 d4c6d14..9db1964 100644
--- a/debian/patches/no_pdf_in_print.diff
+++ b/debian/patches/no_pdf_in_print.diff
@@ -3,10 +3,9 @@ missing pdflib (closes: #478677)
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 24 May 2008 13:49:51 +0200
 
-diff -urNad octave3.0-3.0.1~/scripts/plot/print.m octave3.0-3.0.1/scripts/plot/print.m
---- octave3.0-3.0.1~/scripts/plot/print.m	2008-04-21 18:00:20.000000000 +0200
-+++ octave3.0-3.0.1/scripts/plot/print.m	2008-05-21 12:17:20.000000000 +0200
-@@ -93,6 +93,9 @@
+--- a/scripts/plot/print.m
++++ b/scripts/plot/print.m
+@@ -101,6 +101,9 @@
  ##     Scalable vector graphics
  ##   @item pdf
  ##     Portable document format
@@ -15,4 +14,4 @@ diff -urNad octave3.0-3.0.1~/scripts/plot/print.m octave3.0-3.0.1/scripts/plot/p
 +##
  ##   @end table
  ##
- ##   Other devices are supported by "convert" from ImageMagick.  Type
+ ##   If the device is omitted, it is inferred from the file extension,
diff --git a/debian/patches/normal-markersize.diff b/debian/patches/normal-markersize.diff
index 3328764..a48c31d 100644
--- a/debian/patches/normal-markersize.diff
+++ b/debian/patches/normal-markersize.diff
@@ -3,9 +3,9 @@ Francesco Potorti for the patch.
 
  -- Rafael Laboissiere <rafael at debian.org>  Tue, 24 Feb 2009 11:40:01 +0100
 
---- octave3.1-3.1.52.orig/scripts/plot/__go_draw_axes__.m
-+++ octave3.1-3.1.52/scripts/plot/__go_draw_axes__.m
-@@ -594,7 +594,7 @@
+--- a/scripts/plot/__go_draw_axes__.m
++++ b/scripts/plot/__go_draw_axes__.m
+@@ -674,7 +674,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"))
-@@ -1320,7 +1320,7 @@
+@@ -1444,7 +1444,7 @@
      endif
  
      if (isfield (obj, "markersize"))
diff --git a/debian/patches/termios-h-check-3.1.diff b/debian/patches/termios-h-check-3.1.diff
index f778392..ccae31f 100644
--- a/debian/patches/termios-h-check-3.1.diff
+++ b/debian/patches/termios-h-check-3.1.diff
@@ -4,9 +4,9 @@ the patch.  Closes Bug#520076 for octave3.1.
 
  -- Rafael Laboissiere <rafael at debian.org>  Thu, 12 Mar 2009 23:32:03 +0100
 
---- octave3.1-3.1.54.orig/configure.in
-+++ octave3.1-3.1.54/configure.in
-@@ -1523,7 +1523,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1537,7 +1537,7 @@
  AC_LANG_POP(C++)
  
  have_termios_h=no

-- 
octave