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

[Thomas Weber]

The following commit has been merged in the master branch:
commit 71d170d4dac86d2645305412756ff8a8d2c6cf87
Author: Thomas Weber <tweber at debian.org>
Date:   Sun Sep 26 17:32:48 2010 +0200

    Drop patch fix_empty_opt_argument_for_var

diff --git a/debian/changelog b/debian/changelog
index 73f6d0a..593ae6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ octave-nan (2.3.1-1) UNRELEASED; urgency=low
 
   * New upstream version (closes: 595811)
   * Adapt watch file for individual package releases
+  * Dropped patches: fix_empty_opt_argument_for_var (applied upstream)
 
  -- Thomas Weber <tweber at debian.org>  Sun, 26 Sep 2010 00:14:09 +0200
 
diff --git a/debian/patches/fix_empty_opt_argument_for_var b/debian/patches/fix_empty_opt_argument_for_var
deleted file mode 100644
index 5a60b31..0000000
--- a/debian/patches/fix_empty_opt_argument_for_var
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 5fce6e6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_empty_opt_argument_for_var

-- 
octave-nan