[Pkg-octave-commit] [SCM] octave-statistics branch, master, updated. 7b1eb0b2dc66af33a86959daf66d352ffd006567

[Thomas Weber]

The following commit has been merged in the master branch:
commit 8a16ffbca0c8d5084e718b9b80316fdfeb1e2cc1
Author: Thomas Weber <tweber at debian.org>
Date:   Sat May 15 20:15:41 2010 +0200

    Drop patch fix_bug_with_sprintf

diff --git a/debian/changelog b/debian/changelog
index 0555f5b..775693c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ octave-statistics (1.0.10-1) UNRELEASED; urgency=low
     - Remove Ólafur Jens Sigurðsson <ojsbug at gmail.com> from Uploaders
   * Bump Standards-Version to 3.8.4 (no changes needed)
   * Switch to dpkg-source 3.0 (quilt) format
+  * Dropped patches (applied upstream):
+    - fix_bug_with_sprintf
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 22:55:41 +0100
 
diff --git a/debian/patches/fix_bug_with_sprintf b/debian/patches/fix_bug_with_sprintf
deleted file mode 100644
index 4f3935a..0000000
--- a/debian/patches/fix_bug_with_sprintf
+++ /dev/null
@@ -1,14 +0,0 @@
-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 40f60df..a4824fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-fix_bug_with_sprintf
 remove_outdated_dmult
 data-files-for-tests.diff

-- 
octave-statistics