[Pkg-octave-commit] [SCM] Debian packaging for octave-statistics branch, master, updated. upstream/1.1.0-21-g6f80f80

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit f43a6956c102bfa5c36e263a39f89f4b648fca56
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Wed Mar 14 21:23:16 2012 +0100

    debian/patches/combnk-cells.patch: new patch

diff --git a/debian/patches/combnk-cells.patch b/debian/patches/combnk-cells.patch
new file mode 100644
index 0000000..54be094
--- /dev/null
+++ b/debian/patches/combnk-cells.patch
@@ -0,0 +1,25 @@
+Description: Fix combnk with cell arrays
+ Without this patch, the following test fails on Octave 3.6:
+ %!test
+ %! c = combnk ({1, 2, 3}, 2);
+ %! assert (c, {1, 2; 1, 3; 2, 3});
+Author: Sébastien Villemot <sebastien.villemot at ens.fr>
+Forwarded: http://comments.gmane.org/gmane.comp.gnu.octave.devel/6964
+Last-Update: 2012-03-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/inst/combnk.m
++++ b/inst/combnk.m
+@@ -51,7 +51,11 @@
+   else
+     ## Process data
+     n = numel (data);
+-    retval = [];
++    if iscell (data)
++      retval = {};
++    else
++      retval = [];
++    endif
+     for j = 1:n
+       C = __combnk__ (data ((j+1):end), k-1);
+       C = cat (2, repmat (data (j), rows (C), 1), C);
diff --git a/debian/patches/series b/debian/patches/series
index 5ee188d..40d5445 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 data-files-for-tests.diff
 normalise_distribution-index-scalar.patch
 remove-zscore.patch
+combnk-cells.patch

-- 
Debian packaging for octave-statistics