[Pkg-octave-commit] [SCM] Debian packaging for octave-statistics branch, master, updated. debian/1.1.0-1-14-g7247561

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 6744d7f153ffb4f7bbfa2e30ec73fcf72de3fe24
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Tue Apr 17 14:49:23 2012 +0200

    combnk-cells.patch: remove patch, applied upstream

diff --git a/debian/patches/combnk-cells.patch b/debian/patches/combnk-cells.patch
deleted file mode 100644
index b4012c3..0000000
--- a/debian/patches/combnk-cells.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-Applied-Upstream: commit: 9888
-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 f71a3fc..86f34a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 data-files-for-tests.diff
-combnk-cells.patch
 linkage-clear-lastwarn.patch

-- 
Debian packaging for octave-statistics