[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-29-g0e92d9a

[Thomas Weber]

tags 592517 pending
thanks

The following commit has been merged in the master branch:
commit ec569219044e521dce18b2da2c87f363d04c4e3f
Author: Thomas Weber <tweber at debian.org>
Date:   Sat Aug 28 21:43:12 2010 +0200

    Don't crash on calling addpath
    
    Bug fix for #592517

diff --git a/debian/changelog b/debian/changelog
index 98169e6..cf9192f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+octave3.2 (3.2.4-7) UNRELEASED; urgency=low
+
+  * New patch: fix_relative_addpath command (closes: #592517)
+
+ -- Thomas Weber <tweber at debian.org>  Wed, 18 Aug 2010 22:23:06 +0200
+
 octave3.2 (3.2.4-6) unstable; urgency=low
 
   * New patch: scale_image_point_color, scale image point color (closes:
diff --git a/debian/in/series b/debian/in/series
index 5c489cd..cf60394 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -17,4 +17,5 @@ dont_set_helvetica-3.1.diff
 normal-markersize.diff
 filter_empty_vector
 handle_new_graphicsmagic
+fix_relative_addpath
 :]
diff --git a/debian/patches/fix_relative_addpath b/debian/patches/fix_relative_addpath
new file mode 100644
index 0000000..c3b208b
--- /dev/null
+++ b/debian/patches/fix_relative_addpath
@@ -0,0 +1,20 @@
+From:  "Thomas Weber" <tweber at debian.org>
+Subject: Don't crash on calling addpath('./')
+Description: Octave 3.2 crashes when calling something like 
+ echo "addpath('./'); addpath('./')" | octave
+ This patch originates from a larger patch from upstreams's development version.
+Origin: partly upstream, http://hg.savannah.gnu.org/hgweb/octave/rev/4acae5e46738
+Bug-Debian: http://bugs.debian.org/592517
+Applied-Upstream: http://hg.savannah.gnu.org/hgweb/octave/rev/4acae5e46738
+
+--- a/src/load-path.cc
++++ b/src/load-path.cc
+@@ -653,8 +653,6 @@
+ 
+   if (i != dir_info_list.end ())
+     move (i, false);
+-  else
+-    panic_impossible ();
+ }
+ 
+ void

-- 
octave