[Pkg-octave-commit] [SCM] octave-statistics branch, master, updated. 9340b8d92a3656d8adf7198b7d7d01f7ae86b4da

[Thomas Weber]

The following commit has been merged in the master branch:
commit c0110529029bea74fba5144f6b7d11c5849b5d30
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Wed Jan 13 01:00:10 2010 +0100

    New patch: fix_bug_with_sprintf

diff --git a/debian/changelog b/debian/changelog
index b84475c..1211fbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ octave-statistics (1.0.9-1) unstable; urgency=low
   * New patches: 
     + remove_outdated_dmult: Replace the call to the outdated dmult(). This
       fixes a test failure. Taken from upstream, SVN rev 6725
+    + fix_bug_with_sprintf: Correct usage of sprintf, fixing a test failure.
+      Taken from upstream, SVN rev 6726.
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Wed, 16 Dec 2009 19:08:53 +0100
 
diff --git a/debian/patches/fix_bug_with_sprintf b/debian/patches/fix_bug_with_sprintf
new file mode 100644
index 0000000..4f3935a
--- /dev/null
+++ b/debian/patches/fix_bug_with_sprintf
@@ -0,0 +1,14 @@
+From: Søren Hauberg <soren at hauberg.org>
+Subject: Fix wrong usage of sprintf, which caused a test failure
+Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/main/statistics/inst/__tbl_delim__.m?view=diff&r1=6726&r2=5065&diff_format=h
+--- a/inst/__tbl_delim__.m
++++ b/inst/__tbl_delim__.m
+@@ -55,7 +55,7 @@
+       if ! ismember (d, fieldnames (s))
+         err = ["tblread: delimiter must be either a single " ...
+                "character or one of\n" ...
+-               sprintf("%s, ", fieldnames (s))(1:end-2)];
++               sprintf("%s, ", fieldnames (s){:})(1:end-2)];
+         d = NaN;
+       else
+         d = s.(d);
diff --git a/debian/patches/series b/debian/patches/series
index a4824fe..40f60df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+fix_bug_with_sprintf
 remove_outdated_dmult
 data-files-for-tests.diff

-- 
octave-statistics