[Pkg-octave-commit] [octave] 01/01: d/p/dblquad-s390x.diff: drop patch (no longer needed).

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave.

commit f96a6a95c86bce5b60ca28e8d7c002fca67f671e
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Apr 22 16:51:58 2015 +0200

    d/p/dblquad-s390x.diff: drop patch (no longer needed).
---
 debian/changelog                  |  2 +-
 debian/patches/dblquad-s390x.diff | 22 ----------------------
 debian/patches/series             |  1 -
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f732650..092ae6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ octave (4.0.0~rc3-1) UNRELEASED; urgency=low
     time is no longer included in octave-common (Closes: #759426).
   * d/p/drop_versioned_binaries.diff: Refresh for new upstream version
   * d/p/install_libraries_publically: Refresh for new upstream version
-  * d/p/dblquad-s390x.diff: Refresh for new upstream version
   * d/p/always-build-octave-jar.patch: Refresh for new upstream version
   * d/p/hdf5-flags.patch: Refresh for new upstream version
   * d/p/mkoctfile-infinite-loop.patch: Drop patch (applied upstream)
@@ -23,6 +22,7 @@ octave (4.0.0~rc3-1) UNRELEASED; urgency=low
   [ Sébastien Villemot ]
   * debian/copyright: reflect upstream changes.
   * d/p/hurd_path_max.diff: drop patch (applied upstream).
+  * d/p/dblquad-s390x.diff: drop patch (no longer needed).
 
  -- Rafael Laboissiere <rafael at laboissiere.net>  Wed, 22 Apr 2015 06:25:00 -0300
 
diff --git a/debian/patches/dblquad-s390x.diff b/debian/patches/dblquad-s390x.diff
deleted file mode 100644
index 5870b30..0000000
--- a/debian/patches/dblquad-s390x.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Disable a test of dblquad.m
- That test makes the testsuite crash on s390x. It still needs investigation.
-Author: Sébastien Villemot <sebastien at debian.org>
-Forwarded: no
-Reviewed-by: Rafael Laboissiere <rafael at laboissiere.net>
-Last-Update: 2015-04-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: octave/scripts/general/dblquad.m
-===================================================================
---- octave.orig/scripts/general/dblquad.m	2014-01-02 19:28:07.000000000 +0000
-+++ octave/scripts/general/dblquad.m	2014-01-06 18:35:00.000000000 +0000
-@@ -75,9 +75,6 @@
- endfunction
- 
- 
--## Nasty integrand to show quadcc off
--%!assert (dblquad (@(x,y) 1 ./ (x+y), 0, 1, 0, 1), 2*log (2), 1e-6)
--
- %!assert (dblquad (@(x,y) exp (-x.^2 - y.^2) , -1, 1, -1, 1, 1e-6, @quadgk), pi * erf (1).^2, 1e-6)
- %!assert (dblquad (@(x,y) exp (-x.^2 - y.^2) , -1, 1, -1, 1, 1e-6, @quadl), pi * erf (1).^2, 1e-6)
- %!assert (dblquad (@(x,y) exp (-x.^2 - y.^2) , -1, 1, -1, 1, 1e-6, @quadv), pi * erf (1).^2, 1e-6)
diff --git a/debian/patches/series b/debian/patches/series
index f7dea5b..e4ec420 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ install_libraries_publically
 no_pdf_in_print.diff
 add_info_dir_categories
 mkoctfile-mpi.diff
-dblquad-s390x.diff
 always-build-octave-jar.patch
 hdf5-flags.patch
 hdf5-mkoctfile.patch

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