[Pkg-octave-commit] [SCM] octave-nan branch, master, updated. 26cb20117613601efeee51afd5cac75a3d6eee1d

[Thomas Weber]

tags 594906 pending
thanks

The following commit has been merged in the master branch:
commit 0e8a9af983aa06469acf8379d528118ded3164ef
Author: Thomas Weber <tweber at debian.org>
Date:   Wed Sep 1 22:39:00 2010 +0200

    Bug fix for 594906
    
    Handle the case of an empty second argument to var()

diff --git a/debian/changelog b/debian/changelog
index 420f271..4c8cdff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ octave-nan (1.0.9-2) UNRELEASED; urgency=low
   * debian/control: 
     - Remove Rafael Laboissiere from Uploaders (Closes: #571853)
     - Remove Ólafur Jens Sigurðsson <ojsbug at gmail.com> from Uploaders 
+  * New patch: fix_empty_opt_argument_for_var: correctly handle the case of an
+    empty second argument for var() (closes: #594906).
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 22:39:17 +0100
 
diff --git a/debian/patches/fix_empty_opt_argument_for_var b/debian/patches/fix_empty_opt_argument_for_var
new file mode 100644
index 0000000..5a60b31
--- /dev/null
+++ b/debian/patches/fix_empty_opt_argument_for_var
@@ -0,0 +1,19 @@
+From: Alois Schlögl <alois.schloegl at gmail.com>
+Subject: Correctly handle the case of an empty second argument to var()
+
+Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/extra/NaN/inst/var.m?r1=6294&r2=6295&
+Bug: https://savannah.gnu.org/bugs/index.php?30905
+Bug-Debian: http://bugs.debian.org/594906
+--- a/inst/var.m
++++ b/inst/var.m
+@@ -72,6 +72,10 @@
+ 	return;
+ end; 	
+ 
++if isempty(opt),
++	opt = 0;  
++end;
++
+ if isempty(DIM), 
+         DIM=min(find(size(x)>1));
+         if isempty(DIM), DIM=1; end;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5fce6e6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_empty_opt_argument_for_var

-- 
octave-nan