[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-13-gaa29c3e

[Thomas Weber]

The following commit has been merged in the master branch:
commit f79ee239c6675fad293e587c3a21e29010d6103c
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sun Jan 31 17:54:30 2010 +0100

    Drop patch fix-lsode-in-octave3.2.diff -- applied upstream

diff --git a/debian/changelog b/debian/changelog
index 47691f5..dae5c09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ octave3.2 (3.2.4-1) UNRELEASED; urgency=low
 
   * New upstream release 
   * debian/control: Build against new hdf5 version (closes: #567057)
+  * Drop patch fix-lsode-in-octave3.2.diff, applied upstream
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 31 Jan 2010 17:49:42 +0100
 
diff --git a/debian/in/series b/debian/in/series
index 51635e6..59120eb 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -13,5 +13,4 @@ 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
deleted file mode 100644
index 3df7dcc..0000000
--- a/debian/patches/fix-lsode-in-octave3.2.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-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