Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hello
I'd like to upload openturns 1.3-3 to fix #769260. As it
build-depends on r-base-core, my understanding is that it has to be
uploaded to testing-proposed-updates, right?
Previous GCC versions were giving slightly different results on *-i386
architectures for a single test, and I had to change output to let it
pass.
According to #769260, a newer GCC version had been installed on i386
which fixes this issue, so I will joyfully drop this patch.
I have verified on fischer (kfreebsd-i386, in a testing schroot) that this
patch must be dropped there too, and am currently running the same
check on exodar (hurd-i386, but in a sid chroot since there is no
testing one).
Here is the debdiff between 1.3-2 and 1.3-3, okay to upload?
diff -Nru openturns-1.3/debian/changelog openturns-1.3/debian/changelog
--- openturns-1.3/debian/changelog 2014-04-19 20:42:22.000000000 +0100
+++ openturns-1.3/debian/changelog 2014-11-23 14:43:57.000000000 +0000
@@ -1,3 +1,10 @@
+openturns (1.3-3) testing-proposed-updates; urgency=medium
+
+ * debian/patches/modify-tests-O0-i386.patch: Drop patch, it is
+ no more needed with recent GCC. Closes: #769260
+
+ -- Denis Barbier <barb...@debian.org> Sun, 23 Nov 2014 11:38:35 +0000
+
openturns (1.3-2) unstable; urgency=medium
* tests-disable-broken-R.patch: New patch, to disable 3
diff -Nru openturns-1.3/debian/patches/modify-tests-O0-i386.patch
openturns-1.3/debian/patches/modify-tests-O0-i386.patch
--- openturns-1.3/debian/patches/modify-tests-O0-i386.patch 2014-03-06
21:16:38.000000000 +0000
+++ openturns-1.3/debian/patches/modify-tests-O0-i386.patch 1970-01-01
01:00:00.000000000 +0100
@@ -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 -Nru openturns-1.3/debian/rules openturns-1.3/debian/rules
--- openturns-1.3/debian/rules 2014-03-06 21:16:38.000000000 +0000
+++ openturns-1.3/debian/rules 2014-11-23 14:43:57.000000000 +0000
@@ -53,18 +53,6 @@
-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) \
diff -Nru openturns-1.3/debian/changelog openturns-1.3/debian/changelog
--- openturns-1.3/debian/changelog 2014-04-19 20:42:22.000000000 +0100
+++ openturns-1.3/debian/changelog 2014-11-23 14:43:57.000000000 +0000
@@ -1,3 +1,10 @@
+openturns (1.3-3) testing-proposed-updates; urgency=medium
+
+ * debian/patches/modify-tests-O0-i386.patch: Drop patch, it is
+ no more needed with recent GCC. Closes: #769260
+
+ -- Denis Barbier <barb...@debian.org> Sun, 23 Nov 2014 11:38:35 +0000
+
openturns (1.3-2) unstable; urgency=medium
* tests-disable-broken-R.patch: New patch, to disable 3
diff -Nru openturns-1.3/debian/patches/modify-tests-O0-i386.patch
openturns-1.3/debian/patches/modify-tests-O0-i386.patch
--- openturns-1.3/debian/patches/modify-tests-O0-i386.patch 2014-03-06
21:16:38.000000000 +0000
+++ openturns-1.3/debian/patches/modify-tests-O0-i386.patch 1970-01-01
01:00:00.000000000 +0100
@@ -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 -Nru openturns-1.3/debian/rules openturns-1.3/debian/rules
--- openturns-1.3/debian/rules 2014-03-06 21:16:38.000000000 +0000
+++ openturns-1.3/debian/rules 2014-11-23 14:43:57.000000000 +0000
@@ -53,18 +53,6 @@
-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) \
