[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-10-g46b1f7b

[Thomas Weber]

tags 550828 pending
thanks

The following commit has been merged in the master branch:
commit 26ebb32ed5878a96d913218071944c168e4d4de2
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sun Jan 3 10:15:01 2010 +0100

    Allow passing of implicit functions to lsode (closes: #550828)

diff --git a/debian/changelog b/debian/changelog
index 64e8711..efbe596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+octave3.2 (3.2.3-2) UNRELEASED; urgency=low
+
+  * New patch: fix-lsode-in-octave3.2.diff, allows passing of implicit
+    function  (closes: #550828). Thanks Jaroslav Hajek for the patch.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 06 Oct 2009 20:03:30 +0200
+
 octave3.0 (1:3.0.5-7) unstable; urgency=low
  
   * Merge changes from the 3.2 branch into the 3.0 upload:
diff --git a/debian/in/series b/debian/in/series
index 59120eb..51635e6 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -13,4 +13,5 @@ datenum-vector-input-any-orientation.diff
 no_pdf_in_print.diff
 dont_set_helvetica-3.1.diff
 normal-markersize.diff
+fix-lsode-in-octave3.2.diff
 :]
diff --git a/debian/patches/fix-lsode-in-octave3.2.diff b/debian/patches/fix-lsode-in-octave3.2.diff
new file mode 100644
index 0000000..3df7dcc
--- /dev/null
+++ b/debian/patches/fix-lsode-in-octave3.2.diff
@@ -0,0 +1,32 @@
+Bug fix for #550828
+
+Taken from http://hg.savannah.gnu.org/hgweb/octave/rev/04386b72d3df
+# HG changeset patch
+# User Jaroslav Hajek <highegg at gmail.com>
+# Date 1255604808 -7200
+# Node ID 04386b72d3dfe46650d15dda48c1f9a4d8212244
+# Parent  b7b89061bd0e5164d36c2cd951e797d077e1c51d
+fix extract_function & add obsoleteness warning
+
+--- a/src/variables.cc	Thu Oct 15 08:38:07 2009 +0200
++++ b/src/variables.cc	Thu Oct 15 13:06:48 2009 +0200
+@@ -159,7 +159,7 @@
+ 	{
+ 	  int parse_status;
+ 
+-	  eval_string (cmd, true, parse_status);
++	  eval_string (cmd, true, parse_status, 0);
+ 
+ 	  if (parse_status == 0)
+ 	    {
+@@ -171,6 +171,9 @@
+ 			 warn_for.c_str (), fname.c_str ());
+ 		  return retval;
+ 		}
++
++              warning ("%s: passing function body as a string is obsolete."
++                       " Please use anonymous functions.", warn_for.c_str ());
+ 	    }
+ 	  else
+ 	    error ("%s: `%s' is not valid as a function",
+

-- 
octave