[Pkg-octave-commit] [SCM] octave-odepkg branch, master, updated. 476dee0866e8e92c99265b31909b7fb19ee308e9

Thomas Weber tweber at debian.org
Sun May 16 18:53:35 UTC 2010


The following commit has been merged in the master branch:
commit fade6170f43fd2b6518e5eea777d2f656ca5624e
Author: Thomas Weber <tweber at debian.org>
Date:   Sun May 16 20:07:37 2010 +0200

    Drop patch fix-test

diff --git a/debian/changelog b/debian/changelog
index ecabd49..e62db97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ octave-odepkg (0.6.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 patch fix-test (applied upstream)
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 22:46:10 +0100
 
diff --git a/debian/patches/fix-test b/debian/patches/fix-test
deleted file mode 100644
index 7af181f..0000000
--- a/debian/patches/fix-test
+++ /dev/null
@@ -1,12 +0,0 @@
-Upgrade the test suite to SVN rev 5976, in order to fix a test
---- a/inst/odepkg_testsuite_calcmescd.m
-+++ b/inst/odepkg_testsuite_calcmescd.m
-@@ -47,7 +47,7 @@
- %! odepkg_testsuite_calcmescd ([1 + 1e10, 2 + 1e10, 3 + 1e10], [1, 2, 3], ...
- %!   [1e-3, 1e-4, 1e-5], [1e-6, 1e-6, 1e-6])
- 
--%!assert (odepkg_testsuite_calcmescd ([1, 2, 3], [1, 2, 3], NaN, NaN), NaN);
-+%!assert (odepkg_testsuite_calcmescd ([1, 2, 3], [1, 2, 3], NaN, NaN), Inf);
- %!assert (odepkg_testsuite_calcmescd ([1, 2, 3], [1, 2, 3], 1, 1), Inf);
- %!assert (odepkg_testsuite_calcmescd ([1, 2, 3], [1, 2.1, 3], 1, 1), 1.5, 0.1);
- %!assert (odepkg_testsuite_calcmescd ([1, 2, 3], [1+1e-6, 2, 3], 1, 1), 6.5, 0.2);
diff --git a/debian/patches/series b/debian/patches/series
index 881ce43..9262944 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix-test
 info-dir-section.diff

-- 
octave-odepkg



More information about the Pkg-octave-commit mailing list