[openturns] 01/06: Copy files from upstream distro/debian/ directory
Denis Barbier
barbier-guest at moszumanska.debian.org
Sun Jun 5 18:00:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
barbier-guest pushed a commit to branch debian
in repository openturns.
commit 9d32536430503e1a3347ff708a783736f58d76e0
Author: Denis Barbier <bouzim at gmail.com>
Date: Thu Nov 12 09:29:50 2015 +0000
Copy files from upstream distro/debian/ directory
---
debian/changelog | 14 ++
debian/control | 12 +-
debian/docs | 4 +-
debian/libopenturns0.6.lintian-overrides | 1 -
...0.6-dbg.install => libopenturns0.7-dbg.install} | 0
...penturns0.6.install => libopenturns0.7.install} | 0
debian/libopenturns0.7.lintian-overrides | 1 +
debian/openturns.lintian-overrides | 4 +
debian/patches/modify-tests-O0-i386.patch | 37 ++++
debian/patches/randommixture-x86.patch | 231 ---------------------
debian/patches/series | 2 -
debian/patches/tests-disable-coupling_tools.patch | 6 +-
debian/patches/tests-fix-precision-32bits.patch | 30 ---
debian/python-openturns-dev.install | 1 +
debian/rules | 29 ++-
15 files changed, 82 insertions(+), 290 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9886068..c9de83a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+openturns (1.6-1) experimental; urgency=low
+
+ [ Julien Schueller ]
+ * New upstream release.
+
+ -- Denis Barbier <barbier at debian.org> Thu, 13 Aug 2015 18:14:47 +0200
+
+openturns (1.6~rc1-1) experimental; urgency=low
+
+ [ Julien Schueller ]
+ * New upstream pre-release.
+
+ -- Denis Barbier <barbier at debian.org> Mon, 16 Jun 2015 16:34:47 +0100
+
openturns (1.5-7) unstable; urgency=medium
* debian/patches/randommixture-x86.patch: Fix Python tests,
diff --git a/debian/control b/debian/control
index 2beb84b..1fbde9b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/openturns.git
X-Python-Version: current
X-Python3-Version: current
-Package: libopenturns0.6
+Package: libopenturns0.7
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -50,7 +50,7 @@ Description: dynamic libraries for OpenTURNS
Package: libopenturns-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libopenturns0.6 (= ${binary:Version}),
+Depends: ${misc:Depends}, libopenturns0.7 (= ${binary:Version}),
libmuparser-dev, libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64], libhmat-oss-dev
Replaces: python-openturns-dev (<< 1.5-2)
Breaks: python-openturns-dev (<< 1.5-2)
@@ -70,10 +70,10 @@ Description: headers and development libraries for OpenTURNS
This package provides the OpenTURNS headers should be used if one
wants to link its application against the library.
-Package: libopenturns0.6-dbg
+Package: libopenturns0.7-dbg
Section: debug
Architecture: any
-Depends: libopenturns0.6 (= ${binary:Version}), ${misc:Depends}
+Depends: libopenturns0.7 (= ${binary:Version}), ${misc:Depends}
Description: debug symbols for OpenTURNS
OpenTURNS is a powerful and generic tool to treat and quantify
uncertainties in numerical simulations in design, optimization and
@@ -93,7 +93,7 @@ Description: debug symbols for OpenTURNS
Package: python-openturns
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.6 (= ${binary:Version}), ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.7 (= ${binary:Version}), ${python:Depends}
Provides: ${python:Provides}
Suggests: python-matplotlib, python-scipy
Description: Python front-end of OpenTURNS (aka TUI)
@@ -115,7 +115,7 @@ Description: Python front-end of OpenTURNS (aka TUI)
Package: python3-openturns
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.6 (= ${binary:Version}), ${python3:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.7 (= ${binary:Version}), ${python3:Depends}
Provides: ${python3:Provides}
Suggests: python3-matplotlib, python3-scipy
Description: Python3 front-end of OpenTURNS (aka TUI)
diff --git a/debian/docs b/debian/docs
index 5502ed8..48c7a58 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
-NEWS
-README
+ChangeLog
+README.rst
TODO
diff --git a/debian/libopenturns0.6.lintian-overrides b/debian/libopenturns0.6.lintian-overrides
deleted file mode 100644
index 1171111..0000000
--- a/debian/libopenturns0.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libopenturns0.6 binary: package-name-doesnt-match-sonames libOT0.6 libOTbind0.6
diff --git a/debian/libopenturns0.6-dbg.install b/debian/libopenturns0.7-dbg.install
similarity index 100%
rename from debian/libopenturns0.6-dbg.install
rename to debian/libopenturns0.7-dbg.install
diff --git a/debian/libopenturns0.6.install b/debian/libopenturns0.7.install
similarity index 100%
rename from debian/libopenturns0.6.install
rename to debian/libopenturns0.7.install
diff --git a/debian/libopenturns0.7.lintian-overrides b/debian/libopenturns0.7.lintian-overrides
new file mode 100644
index 0000000..3e45401
--- /dev/null
+++ b/debian/libopenturns0.7.lintian-overrides
@@ -0,0 +1 @@
+libopenturns0.7 binary: package-name-doesnt-match-sonames libOT0.7 libOTbind0.7
diff --git a/debian/openturns.lintian-overrides b/debian/openturns.lintian-overrides
new file mode 100644
index 0000000..54b15d0
--- /dev/null
+++ b/debian/openturns.lintian-overrides
@@ -0,0 +1,4 @@
+# the libraries are only used in the paraview package, so we override the
+# warnings and errors:
+
+
diff --git a/debian/patches/modify-tests-O0-i386.patch b/debian/patches/modify-tests-O0-i386.patch
new file mode 100644
index 0000000..2821c77
--- /dev/null
+++ b/debian/patches/modify-tests-O0-i386.patch
@@ -0,0 +1,37 @@
+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/patches/randommixture-x86.patch b/debian/patches/randommixture-x86.patch
deleted file mode 100644
index 78e0015..0000000
--- a/debian/patches/randommixture-x86.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-Description: Avoid tests failures in RandomMixture on x86
-Author: Denis Barbier
-Origin: Debian
-Forwarded: No
-Last-Update: 2015-05-23
-
-Index: openturns-1.5/lib/test/t_RandomMixture_grid1d.cxx
-===================================================================
---- openturns-1.5.orig/lib/test/t_RandomMixture_grid1d.cxx
-+++ openturns-1.5/lib/test/t_RandomMixture_grid1d.cxx
-@@ -56,8 +56,8 @@ int main(int argc, char *argv[])
- Indices points(1, N);
- NumericalPoint mean(distribution.getMean());
- NumericalPoint sigma(distribution.getStandardDeviation());
-- NumericalPoint xMin(mean - 4.0 * sigma);
-- NumericalPoint xMax(mean + 4.0 * sigma);
-+ NumericalPoint xMin(mean - 3.9 * sigma);
-+ NumericalPoint xMax(mean + 3.9 * sigma);
- NumericalSample grid;
- fullprint << "distribution = " << distribution << std::endl;
- fullprint << "distribution = " << distribution.__str__() << std::endl;
-Index: openturns-1.5/lib/test/t_RandomMixture_grid1d.expout
-===================================================================
---- openturns-1.5.orig/lib/test/t_RandomMixture_grid1d.expout
-+++ openturns-1.5/lib/test/t_RandomMixture_grid1d.expout
-@@ -4,8 +4,8 @@ range = class=Interval name=Unnamed dime
- mean = class=NumericalPoint name=Unnamed dimension=1 values=[3]
- cov = class=CovarianceMatrix dimension=1 implementation=class=MatrixImplementation name=Unnamed rows=1 columns=1 values=[3]
- sigma = class=NumericalPoint name=Unnamed dimension=1 values=[1.73205]
--xMin = class=NumericalPoint name=Unnamed dimension=1 values=[-3.9282]
--xMax = class=NumericalPoint name=Unnamed dimension=1 values=[9.9282]
-+xMin = class=NumericalPoint name=Unnamed dimension=1 values=[-3.755]
-+xMax = class=NumericalPoint name=Unnamed dimension=1 values=[9.755]
- -3.90114;0.00235265;0
- -3.84701;0.002253;0
- -3.79289;0.00215744;0
-Index: openturns-1.5/lib/test/t_RandomMixture_grid2d.cxx
-===================================================================
---- openturns-1.5.orig/lib/test/t_RandomMixture_grid2d.cxx
-+++ openturns-1.5/lib/test/t_RandomMixture_grid2d.cxx
-@@ -57,8 +57,8 @@ int main(int argc, char *argv[])
- Indices points(2, N);
- NumericalPoint mean(dist_2D.getMean());
- NumericalPoint sigma(dist_2D.getStandardDeviation());
-- NumericalPoint xMin(mean - 3.0 * sigma);
-- NumericalPoint xMax(mean + 3.0 * sigma);
-+ NumericalPoint xMin(mean - 2.9 * sigma);
-+ NumericalPoint xMax(mean + 2.9 * sigma);
- NumericalSample grid;
- fullprint << "distribution = " << dist_2D << std::endl;
- fullprint << "distribution = " << dist_2D.__str__() << std::endl;
-@@ -87,8 +87,8 @@ int main(int argc, char *argv[])
- fullprint << "mean = " << distribution2D.getMean() << std::endl;
- fullprint << "cov = " << distribution2D.getCovariance() << std::endl;
- fullprint << "sigma = " << distribution2D.getStandardDeviation() << std::endl;
-- xMin = distribution2D.getMean() - 3.0 * distribution2D.getStandardDeviation();
-- xMax = distribution2D.getMean() + 3.0 * distribution2D.getStandardDeviation();
-+ xMin = distribution2D.getMean() - 2.9 * distribution2D.getStandardDeviation();
-+ xMax = distribution2D.getMean() + 2.9 * distribution2D.getStandardDeviation();
- result = distribution2D.computePDF(xMin, xMax, points, grid);
- for (UnsignedInteger i = 0; i < grid.getSize(); ++i)
- fullprint << grid[i][0] << ";" << grid[i][1] << ";" << result[i][0] << std::endl;
-Index: openturns-1.5/lib/test/t_RandomMixture_grid2d.expout
-===================================================================
---- openturns-1.5.orig/lib/test/t_RandomMixture_grid2d.expout
-+++ openturns-1.5/lib/test/t_RandomMixture_grid2d.expout
-@@ -7,8 +7,8 @@ range = class=Interval name=Unnamed dime
- mean = class=NumericalPoint name=Unnamed dimension=2 values=[0,-0.5]
- cov = class=CovarianceMatrix dimension=2 implementation=class=MatrixImplementation name=Unnamed rows=2 columns=2 values=[0.5,-0.333333,-0.333333,0.916667]
- sigma = class=NumericalPoint name=Unnamed dimension=2 values=[0.707107,0.957427]
--xMin = class=NumericalPoint name=Unnamed dimension=2 values=[-2.12132,-3.37228]
--xMax = class=NumericalPoint name=Unnamed dimension=2 values=[2.12132,2.37228]
-+xMin = class=NumericalPoint name=Unnamed dimension=2 values=[-2.05061,-3.27654]
-+xMax = class=NumericalPoint name=Unnamed dimension=2 values=[2.05061,2.27654]
- -1.98874;-3.19276;0
- -1.72357;-3.19276;0
- -1.45841;-3.19276;0.000146538
-Index: openturns-1.5/lib/test/t_RandomMixture_grid3d.cxx
-===================================================================
---- openturns-1.5.orig/lib/test/t_RandomMixture_grid3d.cxx
-+++ openturns-1.5/lib/test/t_RandomMixture_grid3d.cxx
-@@ -62,8 +62,8 @@ int main(int argc, char *argv[])
- Indices points(3, N);
- NumericalPoint mean(distribution.getMean());
- NumericalPoint sigma(distribution.getStandardDeviation());
-- NumericalPoint xMin(mean - 3.0 * sigma);
-- NumericalPoint xMax(mean + 3.0 * sigma);
-+ NumericalPoint xMin(mean - 2.9 * sigma);
-+ NumericalPoint xMax(mean + 2.9 * sigma);
- NumericalSample grid;
- NumericalSample result(distribution.computePDF(xMin, xMax, points, grid));
- for (UnsignedInteger i = 0; i < grid.getSize(); ++i)
-@@ -102,8 +102,8 @@ int main(int argc, char *argv[])
- fullprint << "mean = " << dist_3D.getMean() << std::endl;
- fullprint << "cov = " << dist_3D.getCovariance() << std::endl;
- fullprint << "sigma = " << dist_3D.getStandardDeviation() << std::endl;
-- xMin = mean - 3.0 * sigma;
-- xMax = mean + 3.0 * sigma;
-+ xMin = mean - 2.9 * sigma;
-+ xMax = mean + 2.9 * sigma;
- fullprint << "xMin = " << xMin << std::endl;
- fullprint << "xMax = " << xMax << std::endl;
- result = dist_3D.computePDF(xMin, xMax, points, grid);
-Index: openturns-1.5/lib/test/t_RandomMixture_grid3d.expout
-===================================================================
---- openturns-1.5.orig/lib/test/t_RandomMixture_grid3d.expout
-+++ openturns-1.5/lib/test/t_RandomMixture_grid3d.expout
-@@ -82,8 +82,8 @@ range = class=Interval name=Unnamed dime
- mean = class=NumericalPoint name=Unnamed dimension=3 values=[0.25,0.125,0.2]
- cov = class=CovarianceMatrix dimension=3 implementation=class=MatrixImplementation name=Unnamed rows=3 columns=3 values=[1.11667,0.233333,-0.341667,0.233333,5.25771,-0.775,-0.341667,-0.775,0.473333]
- sigma = class=NumericalPoint name=Unnamed dimension=3 values=[1.05672,2.29297,0.687992]
--xMin = class=NumericalPoint name=Unnamed dimension=3 values=[-2.92017,-6.75391,-1.86398]
--xMax = class=NumericalPoint name=Unnamed dimension=3 values=[3.42017,7.00391,2.26398]
-+xMin = class=NumericalPoint name=Unnamed dimension=3 values=[-2.8145,-6.52461,-1.79518]
-+xMax = class=NumericalPoint name=Unnamed dimension=3 values=[3.3145,6.77461,2.19518]
- -2.12763;-5.03418;-1.34798;5.16744e-05
- -0.542543;-5.03418;-1.34798;0
- 1.04254;-5.03418;-1.34798;0
-Index: openturns-1.5/python/test/t_RandomMixture_grid1d.expout
-===================================================================
---- openturns-1.5.orig/python/test/t_RandomMixture_grid1d.expout
-+++ openturns-1.5/python/test/t_RandomMixture_grid1d.expout
-@@ -3,8 +3,8 @@ range = [0, 17.7224]
- mean = [3]
- cov = [[ 3 ]]
- sigma = [1.73205]
--xMin = [-3.9282]
--xMax = [9.9282]
-+xMin = [-3.755]
-+xMax = [9.755]
- x;PDF;reference
- -3.90114;0.00235265;0
- -3.84701;0.002253;0
-Index: openturns-1.5/python/test/t_RandomMixture_grid1d.py
-===================================================================
---- openturns-1.5.orig/python/test/t_RandomMixture_grid1d.py
-+++ openturns-1.5/python/test/t_RandomMixture_grid1d.py
-@@ -29,8 +29,8 @@ try:
- points = Indices(1, N)
- mean = distribution.getMean()
- sigma = distribution.getStandardDeviation()
-- xMin = mean - 4.0 * sigma
-- xMax = mean + 4.0 * sigma
-+ xMin = mean - 3.9 * sigma
-+ xMax = mean + 3.9 * sigma
- grid = NumericalSample()
- print "distribution = ", repr(distribution)
- print "range = ", distribution.getRange()
-Index: openturns-1.5/python/test/t_RandomMixture_grid2d.expout
-===================================================================
---- openturns-1.5.orig/python/test/t_RandomMixture_grid2d.expout
-+++ openturns-1.5/python/test/t_RandomMixture_grid2d.expout
-@@ -5,8 +5,8 @@ mean = [0,-0.5]
- cov = [[ 0.5 -0.333333 ]
- [ -0.333333 0.916667 ]]
- sigma = [0.707107,0.957427]
--xMin = [-2.12132,-3.37228]
--xMax = [2.12132,2.37228]
-+xMin = [-2.05061,-3.27654]
-+xMax = [2.05061,2.27654]
- -1.98874;-3.19276;0
- -1.72357;-3.19276;0
- -1.45841;-3.19276;0.000146538
-Index: openturns-1.5/python/test/t_RandomMixture_grid2d.py
-===================================================================
---- openturns-1.5.orig/python/test/t_RandomMixture_grid2d.py
-+++ openturns-1.5/python/test/t_RandomMixture_grid2d.py
-@@ -23,8 +23,8 @@ try:
- points = Indices(2, N)
- mean = dist_2D.getMean()
- sigma = dist_2D.getStandardDeviation()
-- xMin = mean - 3.0 * sigma
-- xMax = mean + 3.0 * sigma
-+ xMin = mean - 2.9 * sigma
-+ xMax = mean + 2.9 * sigma
- grid = NumericalSample()
- print "distribution = ", repr(dist_2D)
- print "range = ", dist_2D.getRange()
-@@ -48,9 +48,9 @@ try:
- print "mean = ", distribution2D.getMean()
- print "cov = ", distribution2D.getCovariance()
- print "sigma = ", distribution2D.getStandardDeviation()
-- xMin = distribution2D.getMean() - 3.0 * \
-+ xMin = distribution2D.getMean() - 2.9 * \
- distribution2D.getStandardDeviation()
-- xMax = distribution2D.getMean() + 3.0 * \
-+ xMax = distribution2D.getMean() + 2.9 * \
- distribution2D.getStandardDeviation()
- result, grid = distribution2D.computePDF(xMin, xMax, points)
- print "x;y;PDF"
-Index: openturns-1.5/python/test/t_RandomMixture_grid3d.expout
-===================================================================
---- openturns-1.5.orig/python/test/t_RandomMixture_grid3d.expout
-+++ openturns-1.5/python/test/t_RandomMixture_grid3d.expout
-@@ -81,8 +81,8 @@ cov = [[ 1.11667 0.233333 -0.341667
- [ 0.233333 5.25771 -0.775 ]
- [ -0.341667 -0.775 0.473333 ]]
- sigma = [1.05672,2.29297,0.687992]
--xMin = [-2.92017,-6.75391,-1.86398]
--xMax = [3.42017,7.00391,2.26398]
-+xMin = [-2.8145,-6.52461,-1.79518]
-+xMax = [3.3145,6.77461,2.19518]
- -2.12763;-5.03418;-1.34798;5.16744e-05
- -0.542543;-5.03418;-1.34798;0
- 1.04254;-5.03418;-1.34798;0
-Index: openturns-1.5/python/test/t_RandomMixture_grid3d.py
-===================================================================
---- openturns-1.5.orig/python/test/t_RandomMixture_grid3d.py
-+++ openturns-1.5/python/test/t_RandomMixture_grid3d.py
-@@ -24,8 +24,8 @@ try:
- points = Indices(3, N)
- mean = distribution.getMean()
- sigma = distribution.getStandardDeviation()
-- xMin = mean - 3.0 * sigma
-- xMax = mean + 3.0 * sigma
-+ xMin = mean - 2.9 * sigma
-+ xMax = mean + 2.9 * sigma
- grid = NumericalSample()
- result, grid = distribution.computePDF(xMin, xMax, points)
- print "x;y;z;PDF"
-@@ -52,8 +52,8 @@ try:
- print "mean = ", dist_3D.getMean()
- print "cov = ", dist_3D.getCovariance()
- print "sigma = ", dist_3D.getStandardDeviation()
-- xMin = mean - 3.0 * sigma
-- xMax = mean + 3.0 * sigma
-+ xMin = mean - 2.9 * sigma
-+ xMax = mean + 2.9 * sigma
- print "xMin = ", xMin
- print "xMax = ", xMax
- result, grid = dist_3D.computePDF(xMin, xMax, points)
diff --git a/debian/patches/series b/debian/patches/series
index 91fe3a8..8a2a9c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
tests-disable-coupling_tools.patch
-tests-fix-precision-32bits.patch
-randommixture-x86.patch
diff --git a/debian/patches/tests-disable-coupling_tools.patch b/debian/patches/tests-disable-coupling_tools.patch
index 8641c51..3bd50e4 100644
--- a/debian/patches/tests-disable-coupling_tools.patch
+++ b/debian/patches/tests-disable-coupling_tools.patch
@@ -12,9 +12,9 @@ Index: openturns/python/test/CMakeLists.txt
@@ -624,7 +624,7 @@
# FIXME: check_get_line_col fails through wine on newer native version
- if ( NOT WIN32 )
-- ot_pyinstallcheck_test ( coupling_tools )
-+#DEB#ot_pyinstallcheck_test ( coupling_tools )
+ if (NOT WIN32)
+- ot_pyinstallcheck_test (coupling_tools)
++#DEB#ot_pyinstallcheck_test (coupling_tools)
endif ()
if (MUPARSER_FOUND AND MATPLOTLIB_FOUND AND SCIPY_FOUND AND R_rot_FOUND)
diff --git a/debian/patches/tests-fix-precision-32bits.patch b/debian/patches/tests-fix-precision-32bits.patch
deleted file mode 100644
index a17541f..0000000
--- a/debian/patches/tests-fix-precision-32bits.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Avoid precision discrepancy on ARM 32 bits
-Author: Denis Barbier
-Origin: Debian
-Forwarded: No
-Last-Update: 2015-05-20
-
-diff --git a/python/test/t_InverseChiSquare_std.py b/python/test/t_InverseChiSquare_std.py
---- a/python/test/t_InverseChiSquare_std.py
-+++ b/python/test/t_InverseChiSquare_std.py
-@@ -75,7 +75,7 @@ try:
- print "cdf gradient (FD)=", CDFgrFD
- quantile = distribution.computeQuantile(0.95)
- print "quantile=", quantile
-- print "cdf(quantile)=", distribution.computeCDF(quantile)
-+ print "cdf(quantile)= %.2f" % distribution.computeCDF(quantile)
- mean = distribution.getMean()
- print "mean=", mean
- covariance = distribution.getCovariance()
-diff --git a/python/test/t_InverseGamma_std.py b/python/test/t_InverseGamma_std.py
---- a/python/test/t_InverseGamma_std.py
-+++ b/python/test/t_InverseGamma_std.py
-@@ -79,7 +79,7 @@ try:
- print "cdf gradient (FD)=", CDFgrFD
- quantile = distribution.computeQuantile(0.95)
- print "quantile=", quantile
-- print "cdf(quantile)=", distribution.computeCDF(quantile)
-+ print "cdf(quantile)= %.2f" % distribution.computeCDF(quantile)
- mean = distribution.getMean()
- print "mean=", mean
- covariance = distribution.getCovariance()
diff --git a/debian/python-openturns-dev.install b/debian/python-openturns-dev.install
new file mode 100644
index 0000000..60f70d9
--- /dev/null
+++ b/debian/python-openturns-dev.install
@@ -0,0 +1 @@
+usr/include/openturns/swig
diff --git a/debian/rules b/debian/rules
index dac50bc..0b56d78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,13 +50,14 @@ endif
debian/tmp/usr/lib/R/site-library/rot:
-mkdir -p $(debRlib)
- R CMD INSTALL --library=$(debRlib) utils/rot_1.4.5.tar.gz
+ R CMD INSTALL --library=$(debRlib) utils/rot_1.4.6.tar.gz
override_dh_auto_configure: debian/tmp/usr/lib/R/site-library/rot $(PYALL:python%=cmake-configure-%) \
cmake-configure-%:
dh_auto_configure -Bbuild-python$* -- \
$(with_tbb) \
+ -DUSE_SPHINX:BOOL=OFF \
-DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++ \
-DCMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
@@ -67,23 +68,18 @@ cmake-configure-%:
-DCMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(ldflags)' \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
- -DLIB_SOVERSION=0.6 \
- -DLIB_VERSION=0.6.0 \
- -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.5 \
- -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.5/wrappers \
+ -DLIB_SOVERSION=0.7 \
+ -DLIB_VERSION=0.7.0 \
+ -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.6 \
+ -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.6/wrappers \
-DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/tmp \
-DLINK_PYTHON_LIBRARY:BOOL=OFF \
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python$* \
-DPYTHON_INCLUDE_DIR:PATH=$$(python$*-config --includes | sed -e 's/ .*//' -e 's/^-I//') \
+ -DPYTHON_INCLUDE_DIR2:PATH=$$(python$*-config --includes | sed -e 's/ .*//' -e 's/^-I//') \
-DPYTHON_LIBRARY:PATH=$$(python$*-config --ldflags | sed -e 's/ .*//' -e 's/^-L//')/libpython$*.so
-override_dh_auto_build: $(PY3VER:python%=cmake-test-py3-%) $(PYALL:python%=cmake-build-%)
-
-cmake-test-py3-%:
- -mkdir -p python$*/test
- cp python/test/*.py python$*/test
- 2to3 -w -n --no-diffs python$*/test
- sed -i -e 's,python/test/\([^ ]*\)\.py,python$*/test/\1.py,g' build-python$*/python/test/CTestTestfile.cmake
+override_dh_auto_build: $(PYALL:python%=cmake-build-%)
cmake-build-%:
$(MAKE) $(test_makeflags) -C build-python$*/lib
@@ -94,7 +90,7 @@ override_dh_auto_install: debian/tmp/usr/lib/R/site-library/rot $(PYALL:python%=
cmake-install-%:
dh_auto_install -Bbuild-python$*
- mkdir -p debian/libopenturns0.6-dbg/usr/lib/debug/usr/lib
+ mkdir -p debian/libopenturns0.7-dbg/usr/lib/debug/usr/lib
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
# CTestTestfile.cmake sets LD_LIBRARY_PATH to find libraries in debian/tmp.
# But it overrides current value, which breaks when run by fakeroot.
@@ -108,11 +104,14 @@ override_dh_makeshlibs:
dh_makeshlibs -Xpyshared
override_dh_strip:
- dh_strip -plibopenturns0.6 --dbg-package=libopenturns0.6-dbg
+ dh_strip -plibopenturns0.7 --dbg-package=libopenturns0.7-dbg
dh_strip
override_dh_python2:
- dh_python2 --no-guessing-versions
+ dh_python2 -p python-openturns
+
+override_dh_python3:
+ dh_python3 -p python3-openturns
override_dh_compress:
dh_compress -X.pdf -X.svn -X.py
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openturns.git
More information about the debian-science-commits
mailing list