[Pkg-octave-commit] r1530 - in octave/trunk/debian: . in patches

[Thomas Weber]

tags 472069 pending
thanks

Author: thomas-guest
Date: 2008-03-28 12:43:48 +0000 (Fri, 28 Mar 2008)
New Revision: 1530

Added:
   octave/trunk/debian/patches/50_fix_handle_for_plotyy.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/octave3.0-00list
Log:
fix for 472069

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-03-27 20:45:59 UTC (rev 1529)
+++ octave/trunk/debian/changelog	2008-03-28 12:43:48 UTC (rev 1530)
@@ -1,12 +1,17 @@
-octave3.0 (1:3.0.0-1) UNRELEASED; urgency=low
+octave3.0 (1:3.0.0-10) UNRELEASED; urgency=low
 
+  [ Rafael Laboissiere ]
   * Synched with the octave2.1 branch
   * debian/rules, debian/in/control: Use the architecture tag "[m68k]" for
     the octave*-headers dependency on f2c.  This eliminates the need for
     using the substitution variable ${m68k:Depends}.
 
- -- Rafael Laboissiere <rafael at debian.org>  Sun, 23 Mar 2008 16:04:13 +0100
+  [ Thomas Weber ]
+  * Apply patch from David Bateman to fix the handle treatment in plotyy
+    (closes: #472069).
 
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Fri, 28 Mar 2008 12:16:11 +0100
+
 octave2.1 (1:2.1.73-18) unstable; urgency=low
 
   [ Rafael Laboissiere ]

Modified: octave/trunk/debian/in/octave3.0-00list
===================================================================
--- octave/trunk/debian/in/octave3.0-00list	2008-03-27 20:45:59 UTC (rev 1529)
+++ octave/trunk/debian/in/octave3.0-00list	2008-03-28 12:43:48 UTC (rev 1530)
@@ -3,3 +3,4 @@
 50_include-cstring-mxarray
 50_clean-doc
 50_dont_downcase_font_names
+50_fix_handle_for_plotyy.dpatch

Added: octave/trunk/debian/patches/50_fix_handle_for_plotyy.dpatch
===================================================================
--- octave/trunk/debian/patches/50_fix_handle_for_plotyy.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/50_fix_handle_for_plotyy.dpatch	2008-03-28 12:43:48 UTC (rev 1530)
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_fix_handle_for_plotyy.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Bug fix for 472069
+
+ at DPATCH@
+diff -urNad octave3.0-3.0.0~/scripts/plot/plotyy.m octave3.0-3.0.0/scripts/plot/plotyy.m
+--- octave3.0-3.0.0~/scripts/plot/plotyy.m	2007-12-13 18:48:59.000000000 +0100
++++ octave3.0-3.0.0/scripts/plot/plotyy.m	2008-03-28 12:20:12.000000000 +0100
+@@ -55,7 +55,37 @@
+ 
+ function [Ax, H1, H2] = plotyy (varargin)
+ 
+-  [ax, varargin] = __plt_get_axis_arg__ ("plotyy", varargin{:});
++  ## Don't use __plt_get_axis_arg__ here as ax is a two vector for plotyy
++  if (nargin > 1 && length (varargin{1}) == 2 && ishandle(varargin{1}(1)) 
++      &&  ishandle(varargin{1}(2)) && 
++      all (floor (varargin{1}) != varargin{1}))
++    obj1 = get (varargin{1}(1));
++    obj2 = get (varargin{1}(2));
++    if (strcmp (obj1.type, "axes") || strcmp (obj2.type, "axes"))
++      ax = [obj1, obj2];
++      varargin(1) = [];
++      if (isempty (varargin))
++	varargin = {};
++      endif
++    else
++      error ("plotyy: expecting first argument to be axes handle");
++    endif
++  else
++    f = get (0, "currentfigure");
++    if (isempty (f))
++      ax(1) = axes ();
++      ax(2) = axes ();
++    else
++      ax = get (f, "children");
++      for i = 3 : length (ax)
++	delete (ax (i));
++      endfor
++      ax = ax(1:2);
++    endif
++    if (nargin < 2)
++      varargin = {};
++    endif
++  endif 
+ 
+   if (nargin < 4)
+     print_usage ();
+@@ -63,8 +93,6 @@
+ 
+   oldh = gca ();
+   unwind_protect
+-    axes (ax);
+-    newplot ();
+     [ax, h1, h2] = __plotyy__ (ax, varargin{:});
+   unwind_protect_cleanup
+     axes (oldh);
+@@ -92,6 +120,8 @@
+ 
+   xlim = [min([x1(:); x2(:)]), max([x1(:); x2(:)])];
+ 
++  axes (ax(1));
++  newplot ();
+   h1 = feval (fun1, x1, y1);
+ 
+   set (ax(1), "ycolor", getcolor (h1(1)));
+@@ -101,7 +131,9 @@
+ 
+   cf = gcf ();
+   set (cf, "nextplot", "add");
+-  ax(2) = axes ();
++  axes (ax(2));
++  newplot ();
++
+   colors = get (ax(1), "colororder");
+   set (ax(2), "colororder", [colors(2:end,:); colors(1,:)]);
+ 


Property changes on: octave/trunk/debian/patches/50_fix_handle_for_plotyy.dpatch
___________________________________________________________________
Name: svn:executable
   + *