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

[Rafael Laboissiere]

Author: rafael
Date: 2009-02-25 14:57:36 +0000 (Wed, 25 Feb 2009)
New Revision: 2696

Added:
   octave/trunk/debian/patches/proper-delete-of-axes-in-clf.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Add patch

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-25 14:51:21 UTC (rev 2695)
+++ octave/trunk/debian/changelog	2009-02-25 14:57:36 UTC (rev 2696)
@@ -1,6 +1,10 @@
 octave3.0 (1:3.0.4~rc5-1) UNRELEASED; urgency=low
 
   * New upstream release candidate
+  * debian/patches/proper-delete-of-axes-in-clf.dpatch: Proper deletion of
+    axes in clf.m.  Fix a regression problem between version 3.0.3 and
+    3.04-rc5.  Proposed by Marco Caliari in the octave-maintainers mailing
+    list on 2008-02-25.
 
  -- Rafael Laboissiere <rafael at debian.org>  Wed, 25 Feb 2009 00:56:16 +0100
 

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-02-25 14:51:21 UTC (rev 2695)
+++ octave/trunk/debian/in/00list	2009-02-25 14:57:36 UTC (rev 2696)
@@ -5,6 +5,7 @@
 dont_set_helvetica.dpatch
 glpk-new-api.dpatch
 real-no-history.dpatch
+proper-delete-of-axes-in-clf.dpatch
 :][V_3_1:
 50_octave-bug-tempfile
 no_pdf_in_print.dpatch

Added: octave/trunk/debian/patches/proper-delete-of-axes-in-clf.dpatch
===================================================================
--- octave/trunk/debian/patches/proper-delete-of-axes-in-clf.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/proper-delete-of-axes-in-clf.dpatch	2009-02-25 14:57:36 UTC (rev 2696)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## proper-delete-of-axes-in-clf.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Proper deletion of axes in clf.m.  Fix a regression problem 
+## DP: between version 3.0.3 and 3.04-rc5.  Proposed by Marco Caliari
+## DP: in the octave-maintainers mailing list on 2008-02-25.
+
+ at DPATCH@
+--- octave3.0-3.0.4~rc5.orig/scripts/plot/clf.m
++++ octave3.0-3.0.4~rc5/scripts/plot/clf.m
+@@ -71,7 +71,9 @@
+     hc = get (hfig, "children");
+   endif
+ 
++  set (hfig, "currentaxes", []);
+   ## Delete the children.
+-  delete (hc);
+-
++  if (ishandle (hc))
++    delete (hc);
++  endif
+ endfunction