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

[Rafael Laboissiere]

tags 0 pending
tags 3 pending
tags 4 pending
tags 520220 pending
thanks

Author: rafael
Date: 2009-03-28 08:44:25 +0000 (Sat, 28 Mar 2009)
New Revision: 2766

Removed:
   octave/trunk/debian/patches/proper-delete-of-axes-in-clf.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Preparation for new upstream RC

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-03-28 08:41:58 UTC (rev 2765)
+++ octave/trunk/debian/changelog	2009-03-28 08:44:25 UTC (rev 2766)
@@ -1,3 +1,15 @@
+octave3.0 (1:3.0.4~rc7-1) UNRELEASED; urgency=low
+
+  * New upstream release candidate.  This version has release-quality,
+    IMO, even though it is a "release candidate".  Let us allow it into
+    testing (closes: #520220), although I hope that the final 3.0.4 will
+    come out before its quarantine period in unstable is finished.
+
+  * debian/patches/proper-delete-of-axes-in-clf.dpatch: Remove patch
+    (applied upstream)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Thu, 26 Mar 2009 07:22:41 +0100
+
 octave3.1 (3.1.55-1) experimental; urgency=low
 
   * New upstream development snapshot

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-03-28 08:41:58 UTC (rev 2765)
+++ octave/trunk/debian/in/00list	2009-03-28 08:44:25 UTC (rev 2766)
@@ -5,7 +5,6 @@
 dont_set_helvetica.dpatch
 glpk-new-api.dpatch
 real-no-history.dpatch
-proper-delete-of-axes-in-clf.dpatch
 termios-h-check-3.0.dpatch
 :][V_3_1:
 50_octave-bug-tempfile

Deleted: octave/trunk/debian/patches/proper-delete-of-axes-in-clf.dpatch
===================================================================
--- octave/trunk/debian/patches/proper-delete-of-axes-in-clf.dpatch	2009-03-28 08:41:58 UTC (rev 2765)
+++ octave/trunk/debian/patches/proper-delete-of-axes-in-clf.dpatch	2009-03-28 08:44:25 UTC (rev 2766)
@@ -1,47 +0,0 @@
-#! /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,11 @@
-     hc = get (hfig, "children");
-   endif
- 
-+  set (hfig, "currentaxes", []);
-   ## Delete the children.
--  delete (hc);
--
-+  for k = get (hfig, "children")
-+    if (ishandle (k))
-+      delete (k);
-+    endif
-+  endfor
- endfunction
---- octave3.0-3.0.4~rc5.orig/src/graphics.cc
-+++ octave3.0-3.0.4~rc5/src/graphics.cc
-@@ -715,7 +715,7 @@
- 
-   if (k >= 0)
-     {
--      Matrix new_kids (n-1, 1);
-+      Matrix new_kids (1, n-1);
-       octave_idx_type j = 0;
-       for (octave_idx_type i = 0; i < n; i++)
- 	{
---- octave3.0-3.0.4~rc5.orig/scripts/plot/legend.m
-+++ octave3.0-3.0.4~rc5/scripts/plot/legend.m
-@@ -171,7 +171,7 @@
-   endif
- 
-   warned = false;
--  for i = nargs:-1:1
-+  for i = 1:nargs
-     arg = varargin{i};
-     if (ischar (arg))
-       while (k <= nkids