[openturns] 01/02: Revert "New patch: debian/patches/modify-tests-O0-i386.patch"

[Denis Barbier]

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

barbier-guest pushed a commit to branch debian1.3
in repository openturns.

commit 74b74eefb39d8d5f4bca2ef82a0631ae89c051e9
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sun Nov 23 11:08:24 2014 +0000

    Revert "New patch: debian/patches/modify-tests-O0-i386.patch"
    
    This reverts commit 5bc73a48db6b64cd9b5f90058c4e40bd34502719.
---
 debian/patches/modify-tests-O0-i386.patch | 37 -------------------------------
 debian/rules                              | 12 ----------
 2 files changed, 49 deletions(-)

diff --git a/debian/patches/modify-tests-O0-i386.patch b/debian/patches/modify-tests-O0-i386.patch
deleted file mode 100644
index 2821c77..0000000
--- a/debian/patches/modify-tests-O0-i386.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Modify output of TrapezoidalFactory tests.
- There is a bug in GCC 4.8 on *-i386 architectures, several tests
- hang.  In order to avoid these problems, algocobyla.c is compiled
- without optimization; but those tests must be modified.
- This patch is applied only on *-i386 architectures.
-Author: Denis Barbier
-Origin: Debian
-Forwarded: no
-Last-Update: 2013-07-02
-
---- openturns-1.1.orig/lib/test/t_TrapezoidalFactory_std.expout
-+++ openturns-1.1/lib/test/t_TrapezoidalFactory_std.expout
-@@ -1,8 +1,8 @@
- Distribution          =class=Trapezoidal name=Trapezoidal dimension=1 a=1 b=2.3 c=4.5 d=5 h=0.322581
--Estimated distribution=class=Trapezoidal name=Trapezoidal dimension=1 a=1.006 b=2.275 c=4.545 d=4.99 h=0.3198
-+Estimated distribution=class=Trapezoidal name=Trapezoidal dimension=1 a=1.005 b=2.279 c=4.545 d=4.99 h=0.32
- Default distribution=class=Trapezoidal name=Trapezoidal dimension=1 a=-2 b=-1 c=1 d=2 h=0.333333
- Distribution from parameters=class=Trapezoidal name=Trapezoidal dimension=1 a=1 b=2.3 c=4.5 d=5 h=0.322581
- Trapezoidal          =class=Trapezoidal name=Trapezoidal dimension=1 a=1 b=2.3 c=4.5 d=5 h=0.322581
--Estimated trapezoidal=class=Trapezoidal name=Trapezoidal dimension=1 a=1.006 b=2.275 c=4.545 d=4.99 h=0.3198
-+Estimated trapezoidal=class=Trapezoidal name=Trapezoidal dimension=1 a=1.005 b=2.279 c=4.545 d=4.99 h=0.32
- Default trapezoidal=class=Trapezoidal name=Trapezoidal dimension=1 a=-2 b=-1 c=1 d=2 h=0.333333
- Trapezoidal from parameters=class=Trapezoidal name=Trapezoidal dimension=1 a=1 b=2.3 c=4.5 d=5 h=0.322581
---- openturns-1.1.orig/python/test/t_TrapezoidalFactory_std.expout
-+++ openturns-1.1/python/test/t_TrapezoidalFactory_std.expout
-@@ -1,8 +1,8 @@
- distribution= class=Trapezoidal name=Trapezoidal dimension=1 a=1 b=2.3 c=4.5 d=5 h=0.322581
--Estimated distribution= class=Trapezoidal name=Trapezoidal dimension=1 a=1.006 b=2.275 c=4.545 d=4.99 h=0.3198
-+Estimated distribution= class=Trapezoidal name=Trapezoidal dimension=1 a=1.005 b=2.279 c=4.545 d=4.99 h=0.32
- Default distribution= Trapezoidal(a = -2, b = -1, c = 1, d = 2)
- Distribution from parameters= Trapezoidal(a = 1, b = 2.3, c = 4.5, d = 5)
- Trapezoidal          = Trapezoidal(a = 1, b = 2.3, c = 4.5, d = 5)
--Estimated trapezoidal= Trapezoidal(a = 1.006, b = 2.275, c = 4.545, d = 4.99)
-+Estimated trapezoidal= Trapezoidal(a = 1.005, b = 2.279, c = 4.545, d = 4.99)
- Default trapezoidal= Trapezoidal(a = -2, b = -1, c = 1, d = 2)
- Trapezoidal from parameters= Trapezoidal(a = 1, b = 2.3, c = 4.5, d = 5)
-
diff --git a/debian/rules b/debian/rules
index dbcf3e8..b9694c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,18 +53,6 @@ debian/tmp/usr/lib/R/site-library/rot:
 	-mkdir -p $(debRlib)
 	R CMD INSTALL --library=$(debRlib) utils/rot_1.4.5.tar.gz
 
-ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 kfreebsd-i386 hurd-i386))
-override_dh_quilt_patch:
-	dh_quilt_patch
-	test -e debian/patches/modify-tests-O0-i386.applied || patch -p1 < debian/patches/modify-tests-O0-i386.patch
-	touch debian/patches/modify-tests-O0-i386.applied
-
-override_dh_quilt_unpatch:
-	test ! -e debian/patches/modify-tests-O0-i386.applied || patch -R -p1 < debian/patches/modify-tests-O0-i386.patch
-	-rm -f debian/patches/modify-tests-O0-i386.applied
-	dh_quilt_unpatch
-endif
-
 override_dh_auto_configure: debian/tmp/usr/lib/R/site-library/rot
 	dh_auto_configure -- \
             $(with_tbb) \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openturns.git