[Pkg-octave-commit] [octave-statistics] 04/05: d/p/combnk-implicit-conversion-warn.patch: Add patch

Rafael Laboissière rlaboiss-guest at moszumanska.debian.org
Sun Sep 13 09:38:11 UTC 2015


This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-statistics.

commit fe9de007b9ebe04b4ef7ca54363e140953de3819
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Sep 13 03:40:11 2015 -0300

    d/p/combnk-implicit-conversion-warn.patch: Add patch
---
 debian/patches/combnk-implicit-conversion-warn.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/combnk-implicit-conversion-warn.patch b/debian/patches/combnk-implicit-conversion-warn.patch
new file mode 100644
index 0000000..bfe1a93
--- /dev/null
+++ b/debian/patches/combnk-implicit-conversion-warn.patch
@@ -0,0 +1,20 @@
+Description: Avoid warning when calling combnk on strings
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Forwarded: https://savannah.gnu.org/bugs/?45670
+Last-Update: 2015-09-13
+
+--- octave-statistics-1.2.4.orig/inst/combnk.m
++++ octave-statistics-1.2.4/inst/combnk.m
+@@ -60,7 +60,11 @@ function retval = __combnk__ (data, k)
+       C = __combnk__ (data ((j+1):end), k-1);
+       C = cat (2, repmat (data (j), rows (C), 1), C);
+       if (!isempty (C))
+-        retval = [retval; C];
++        if (isempty (retval))
++          retval = C;
++        else
++          retval = [retval; C];
++        endif
+       endif
+     endfor
+   endif
diff --git a/debian/patches/series b/debian/patches/series
index 293f5c2..00a4553 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ use-corr-instead-of-cor.patch
 small-k-in-gev-functions.patch
 use-corr-instead-of-corrcoef.patch
 expected-linkage-warning.patch
+combnk-implicit-conversion-warn.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-statistics.git



More information about the Pkg-octave-commit mailing list