r44802 - in /packages/openturns/trunk/debian: ./ patches/ rotRPackage/ rotRPackage/R/ rotRPackage/man/
barbier-guest at users.alioth.debian.org
barbier-guest at users.alioth.debian.org
Tue May 15 20:19:56 UTC 2012
Author: barbier-guest
Date: Tue May 15 20:19:55 2012
New Revision: 44802
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44802
Log:
Upgrade openturns to 1.0
* Upstream changes to their Debian packaging:
+ Remove openturns-wrapper and mote its files into libopenturns0 and libopenturns-dev.
+ New python-openturns-dev package.
+ Add -fno-cse-follow-jumps to CFLAGS to work around an undefined GCC bug which makes one test
hang on x86. (Closes: #666782)
+ Build-depends on libtbb-dev.
+ Update debian/*.install files.
* Bump SONAME to libopenturns0.1.
* Drop useless compilation flags: -DBOOST_SP_USE_PTHREADS -DOT_DEBUG_LEVEL.
* Build with cmake instead of autotools, this is much faster and requires less memory.
* Use dpkg-buildflags to set build flags
* Update debian/patches/ftbfs-4.7.patch, this patch has been applied upstream but another chunk has to be changed.
* Some tests fail when compiled with g++ 4.7 and -O2/-O3, thus build with g++-4.6 for now.
* Also run installcheck target (except t_WrapperFile_std which cannot work when installing into DESTDIR)
* Fix rpath handling, chrpath is no more needed.
* New patch: no-link-python.diff; do not link against python libraries, otherwise module cannot be loaded.
See #670066.
Added:
packages/openturns/trunk/debian/libopenturns0.1.install
packages/openturns/trunk/debian/libopenturns0.1.lintian-overrides
packages/openturns/trunk/debian/patches/cmake-configdir.patch
packages/openturns/trunk/debian/patches/debian-soname.patch
packages/openturns/trunk/debian/patches/disable-test-wrapper.patch
packages/openturns/trunk/debian/patches/installcheck.patch
packages/openturns/trunk/debian/patches/no-link-python.patch
packages/openturns/trunk/debian/python-openturns-dev.install
Removed:
packages/openturns/trunk/debian/libopenturns0.install
packages/openturns/trunk/debian/libopenturns0.lintian-overrides
packages/openturns/trunk/debian/openturns-wrapper.install
packages/openturns/trunk/debian/openturns-wrapper.lintian-overrides
packages/openturns/trunk/debian/rotRPackage/DESCRIPTION
packages/openturns/trunk/debian/rotRPackage/R/ad.test.R
packages/openturns/trunk/debian/rotRPackage/R/computeLinearModel.R
packages/openturns/trunk/debian/rotRPackage/R/computeResidualLm.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestAndersonDarlingNormal.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestChiSquaredGeometric.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestChiSquaredPoisson.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestChiSquaredUserDefined.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestCramerVonMisesNormal.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovBeta.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovExponential.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovGamma.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovGumbel.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovLogNormal.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovLogistic.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovNormal.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovStudent.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovTriangular.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovTruncatedNormal.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovUniform.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestKolmogorovWeibull.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestPartialPearson.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestPartialRegression.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestPartialSpearman.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestPearson.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestRegression.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestSpearman.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestTwoSampleChiSquared.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestTwoSamplePearson.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestTwoSampleSmirnov.R
packages/openturns/trunk/debian/rotRPackage/R/computeTestTwoSampleSpearman.R
packages/openturns/trunk/debian/rotRPackage/R/computeTruncatedNormalPdf.R
packages/openturns/trunk/debian/rotRPackage/R/cvm.test.R
packages/openturns/trunk/debian/rotRPackage/R/dtnorm.R
packages/openturns/trunk/debian/rotRPackage/R/estimateTruncatedNormalParameters.R
packages/openturns/trunk/debian/rotRPackage/R/fitdistr.R
packages/openturns/trunk/debian/rotRPackage/R/pgumbel.R
packages/openturns/trunk/debian/rotRPackage/R/predictValuesLm.R
packages/openturns/trunk/debian/rotRPackage/R/ptnorm.R
packages/openturns/trunk/debian/rotRPackage/R/ptriangle.R
packages/openturns/trunk/debian/rotRPackage/R/testLmAdjustedRSquare.R
packages/openturns/trunk/debian/rotRPackage/R/testLmFisher.R
packages/openturns/trunk/debian/rotRPackage/R/testLmResidualMean.R
packages/openturns/trunk/debian/rotRPackage/R/testLmRsquared.R
packages/openturns/trunk/debian/rotRPackage/README
packages/openturns/trunk/debian/rotRPackage/man/ad.test.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeLinearModel.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeResidualLm.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestAndersonDarlingNormal.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestChiSquaredGeometric.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestChiSquaredPoisson.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestChiSquaredUserDefined.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestCramerVonMisesNormal.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovBeta.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovExponential.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovGamma.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovGumbel.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovLogNormal.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovLogistic.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovNormal.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovStudent.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovTriangular.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovTruncatedNormal.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovUniform.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestKolmogorovWeibull.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestPartialPearson.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestPartialRegression.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestPartialSpearman.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestPearson.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestRegression.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestSpearman.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestTwoSampleChiSquared.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestTwoSamplePearson.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestTwoSampleSmirnov.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTestTwoSampleSpearman.Rd
packages/openturns/trunk/debian/rotRPackage/man/computeTruncatedNormalPdf.Rd
packages/openturns/trunk/debian/rotRPackage/man/cvm.test.Rd
packages/openturns/trunk/debian/rotRPackage/man/dtnorm.Rd
packages/openturns/trunk/debian/rotRPackage/man/estimateTruncatedNormalParameters.Rd
packages/openturns/trunk/debian/rotRPackage/man/fitdistr.Rd
packages/openturns/trunk/debian/rotRPackage/man/pgumbel.Rd
packages/openturns/trunk/debian/rotRPackage/man/predictValuesLm.Rd
packages/openturns/trunk/debian/rotRPackage/man/ptnorm.Rd
packages/openturns/trunk/debian/rotRPackage/man/ptriangle.Rd
packages/openturns/trunk/debian/rotRPackage/man/testLmAdjustedRSquare.Rd
packages/openturns/trunk/debian/rotRPackage/man/testLmFisher.Rd
packages/openturns/trunk/debian/rotRPackage/man/testLmResidualMean.Rd
packages/openturns/trunk/debian/rotRPackage/man/testLmRsquared.Rd
Modified:
packages/openturns/trunk/debian/control
packages/openturns/trunk/debian/copyright
packages/openturns/trunk/debian/libopenturns-dev.install
packages/openturns/trunk/debian/openturns-examples.install
packages/openturns/trunk/debian/patches/ftbfs-4.7.patch
packages/openturns/trunk/debian/patches/series
packages/openturns/trunk/debian/python-openturns.install
packages/openturns/trunk/debian/rules
Modified: packages/openturns/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/control?rev=44802&op=diff
==============================================================================
--- packages/openturns/trunk/debian/control (original)
+++ packages/openturns/trunk/debian/control Tue May 15 20:19:55 2012
@@ -3,17 +3,20 @@
Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: debhelper (>= 8), chrpath, gcc (>= 4.2), g++ (>= 4.2), gfortran (>= 4.2), libxml2-dev, liblapack-dev, libblas-dev, r-base-core (>= 2.0), python-dev (>= 2.6.6-3~), python-rpy2, ghostscript, graphviz, doxygen-latex, docbook-to-man, swig, autoconf
+Build-Depends: debhelper (>= 8), quilt, g++-4.6, gfortran-4.6, bison, flex, libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64 powerpc ppc64], r-base-core, python-dev, python-rpy2, ghostscript, graphviz, swig, cmake, bc
Standards-Version: 3.9.3
Homepage: http://trac.openturns.org/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/openturns/trunk
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk
-Package: libopenturns0
+Package: libopenturns0.1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, r-base-core (>= 2.0), liblapack3gf
+Depends: ${shlibs:Depends}, ${misc:Depends}, r-base-core
Suggests: python-openturns
+Replaces: openturns-wrapper, libopenturns0
+Breaks: openturns-wrapper
+Conflicts: libopenturns0
Description: dynamic libraries for OpenTURNS
OpenTURNS is a powerful and generic tool to treat and quantify
uncertainties in numerical simulations in design, optimization and
@@ -42,7 +45,9 @@
Package: libopenturns-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.1 (= ${binary:Version})
+Replaces: openturns-wrapper
+Breaks: openturns-wrapper
Description: headers and development libraries for OpenTURNS
OpenTURNS is a powerful and generic tool to treat and quantify
uncertainties in numerical simulations in design, optimization and
@@ -82,7 +87,7 @@
Package: python-openturns
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0, ${python:Depends}, python-rpy2, ghostscript, python-qt4
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.1 (= ${binary:Version}), ${python:Depends}, python-rpy2, ghostscript, python-qt4
Provides: ${python:Provides}
Description: Python front-end of OpenTURNS (aka TUI)
OpenTURNS is a powerful and generic tool to treat and quantify
@@ -100,9 +105,31 @@
This package provides a textual user interface that gives access to
all the functionalities provided by the OpenTURNS library.
+Package: python-openturns-dev
+Section: python
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns-dev, python-openturns (= ${binary:Version}), python-dev
+Provides: ${python:Provides}
+Description: Python front-end of OpenTURNS (aka TUI)
+ OpenTURNS is a powerful and generic tool to treat and quantify
+ uncertainties in numerical simulations in design, optimization and
+ control. It allows both sensitivity and reliability analysis studies:
+ * defining the outputs of interest and decision criterion;
+ * quantify and model the source of uncertainties;
+ * propagate uncertainties and/or analyse sensitivity and
+ * rank the sources of uncertainty
+ .
+ OpenTURNS is a large project with more than 300 C++ classes which
+ uses well known and supported software such as R for the statistical
+ methods and BLAS/LAPACK for the linear algebra.
+ .
+ This package provides development files for python modules.
+
Package: openturns-examples
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0, python-openturns
+Depends: ${shlibs:Depends}, ${misc:Depends}, python-openturns (= ${binary:Version}), libopenturns-dev
+Replaces: openturns-wrapper
+Breaks: openturns-wrapper (<= 0.13.2)
Description: examples of OpenTURNS functionalities
OpenTURNS is a powerful and generic tool to treat and quantify
uncertainties in numerical simulations in design, optimization and
@@ -123,34 +150,8 @@
platform but they can also be seen as tutorials for
beginners.
-Package: openturns-wrapper
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0
-Description: example of a wrapper for OpenTURNS
- OpenTURNS is a powerful and generic tool to treat and quantify
- uncertainties in numerical simulations in design, optimization and
- control. It allows both sensitivity and reliability analysis studies:
- * defining the outputs of interest and decision criterion;
- * quantify and model the source of uncertainties;
- * propagate uncertainties and/or analyse sensitivity and
- * rank the sources of uncertainty
- .
- OpenTURNS is a large project with more than 300 C++ classes which
- uses well known and supported software such as R for the statistical
- methods and BLAS/LAPACK for the linear algebra.
- .
- This package provides a wrapper that allows any external code to be
- linked against the OpenTURNS library and to be used through the
- library functionalities.
- .
- Any code can be used provided that it can be seen as a
- numerical function that reads N doubles and returns P doubles.
- Notice that the wrapper of this package only shows how to link
- against the OpenTURNS library. It does not show how to parse
- or write the arguments of the function so they can be sent to or
- retrieved from the code.
-
Package: openturns-validation
+Section: science
Architecture: all
Depends: ${misc:Depends}
Description: validation files for OpenTURNS
Modified: packages/openturns/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/copyright?rev=44802&op=diff
==============================================================================
--- packages/openturns/trunk/debian/copyright (original)
+++ packages/openturns/trunk/debian/copyright Tue May 15 20:19:55 2012
@@ -24,19 +24,19 @@
* Phimeca, an Engineering Consultancy company specialised in
Structural Reliability analysis.
- Copyright (C) 2005-2008 Électricité de France (EDF)
+ Copyright (C) 2005-2012 Électricité de France (EDF)
- Copyright (C) 2005-2008 European Aeronautic Defence and Space
+ Copyright (C) 2005-2012 European Aeronautic Defence and Space
company (EADS)
- Copyright (C) 2005-2008 Phimeca
+ Copyright (C) 2005-2012 Phimeca
License:
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License
- as published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -49,7 +49,7 @@
02110-1301 USA
On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in `/usr/share/common-licenses/LGPL'.
+License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
The Debian packaging is (C) 2008, Christophe Prud'homme
<prudhomm at debian.org> and is licensed under the GPL, see
Modified: packages/openturns/trunk/debian/libopenturns-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/libopenturns-dev.install?rev=44802&op=diff
==============================================================================
--- packages/openturns/trunk/debian/libopenturns-dev.install (original)
+++ packages/openturns/trunk/debian/libopenturns-dev.install Tue May 15 20:19:55 2012
@@ -1,5 +1,5 @@
usr/bin/*
-usr/lib/openturns/lib*.so usr/lib/
-usr/lib/openturns/lib*.a usr/lib/
+usr/lib/libOT*.so
usr/share/openturns/m4/*
-usr/include/openturns/*
+usr/include/openturns/*.h*
+usr/share/openturns/WrapperTemplates
Added: packages/openturns/trunk/debian/libopenturns0.1.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/libopenturns0.1.install?rev=44802&op=file
==============================================================================
--- packages/openturns/trunk/debian/libopenturns0.1.install (added)
+++ packages/openturns/trunk/debian/libopenturns0.1.install Tue May 15 20:19:55 2012
@@ -1,0 +1,5 @@
+usr/lib/libOT*.so.0*
+usr/lib/R/site-library/rotRPackage
+usr/lib/openturns/wrappers/wrapper*.dtd
+usr/lib/openturns/wrappers/generic.*
+etc/openturns/*
Added: packages/openturns/trunk/debian/libopenturns0.1.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/libopenturns0.1.lintian-overrides?rev=44802&op=file
==============================================================================
--- packages/openturns/trunk/debian/libopenturns0.1.lintian-overrides (added)
+++ packages/openturns/trunk/debian/libopenturns0.1.lintian-overrides Tue May 15 20:19:55 2012
@@ -1,0 +1,1 @@
+libopenturns0.1 binary: package-name-doesnt-match-sonames libOT0.1 libOTbind0.1
Modified: packages/openturns/trunk/debian/openturns-examples.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/openturns-examples.install?rev=44802&op=diff
==============================================================================
--- packages/openturns/trunk/debian/openturns-examples.install (original)
+++ packages/openturns/trunk/debian/openturns-examples.install Tue May 15 20:19:55 2012
@@ -1,1 +1,8 @@
usr/share/openturns/examples/* usr/lib/openturns/examples/
+usr/share/openturns/examples/*.py
+usr/lib/openturns/wrappers/external_code_threads*
+usr/lib/openturns/wrappers/minimal_wrapper*
+usr/lib/openturns/wrappers/poutre*
+usr/lib/openturns/wrappers/testwrapper*
+usr/lib/openturns/wrappers/Test*
+usr/lib/openturns/wrappers/wrapper.xml
Added: packages/openturns/trunk/debian/patches/cmake-configdir.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/cmake-configdir.patch?rev=44802&op=file
==============================================================================
--- packages/openturns/trunk/debian/patches/cmake-configdir.patch (added)
+++ packages/openturns/trunk/debian/patches/cmake-configdir.patch Tue May 15 20:19:55 2012
@@ -1,0 +1,15 @@
+Reported upstream http://trac.openturns.org/ticket/472
+
+ http://trac.openturns.org/changeset/2509
+ http://trac.openturns.org/changeset/2510
+
+--- openturns-1.0.orig/lib/etc/CMakeLists.txt
++++ openturns-1.0/lib/etc/CMakeLists.txt
+@@ -32,6 +32,6 @@ configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/openturns.conf.in
+ @ONLY )
+
+ install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/openturns.conf
+- DESTINATION etc/openturns
++ DESTINATION ${OPENTURNS_SYSCONFIG_PATH}/openturns
+ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
+ )
Added: packages/openturns/trunk/debian/patches/debian-soname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/debian-soname.patch?rev=44802&op=file
==============================================================================
--- packages/openturns/trunk/debian/patches/debian-soname.patch (added)
+++ packages/openturns/trunk/debian/patches/debian-soname.patch Tue May 15 20:19:55 2012
@@ -1,0 +1,25 @@
+Description: Set a Debian specific SONAME
+ Upstream does not yet use library versioning.
+ We will use 0.1, 0.2, etc. to not conflict with
+ future upstream SONAMEs.
+Author: Denis Barbier <bouzim at gmail.com>
+
+---
+
+Origin: Debian
+Forwarded: no
+Last-Update: 2012-05-13
+
+--- openturns-1.0.orig/lib/src/CMakeLists.txt
++++ openturns-1.0/lib/src/CMakeLists.txt
+@@ -63,8 +63,8 @@ include_directories ( ${INTERNAL_INCLUDE
+ link_directories ( ${CMAKE_Fortran_IMPLICIT_LINK_DIRECTORIES} )
+ add_library ( OTbind SHARED bind.c )
+ add_library ( OT SHARED ${SOURCEFILES} ${BUILT_SOURCEFILES} )
+-set_target_properties ( OT OTbind PROPERTIES SOVERSION 0 )
+-set_target_properties ( OT OTbind PROPERTIES VERSION 0.0.0 )
++set_target_properties ( OT OTbind PROPERTIES SOVERSION 0.1 )
++set_target_properties ( OT OTbind PROPERTIES VERSION 0.1.0 )
+ if ( BISON_FOUND )
+ add_dependencies ( OT generate_csv_parser )
+ endif ( BISON_FOUND )
Added: packages/openturns/trunk/debian/patches/disable-test-wrapper.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/disable-test-wrapper.patch?rev=44802&op=file
==============================================================================
--- packages/openturns/trunk/debian/patches/disable-test-wrapper.patch (added)
+++ packages/openturns/trunk/debian/patches/disable-test-wrapper.patch Tue May 15 20:19:55 2012
@@ -1,0 +1,15 @@
+Description: Disable WrapperFile_std test
+ It does not work when installing in DESTDIR.
+Author: Denis Barbier <bouzim at gmail.com>
+
+--- openturns-1.0.orig/python/test/CMakeLists.txt
++++ openturns-1.0/python/test/CMakeLists.txt
+@@ -140,7 +140,7 @@ ot_pyinstallcheck_test ( HermitianMatrix
+ ot_pyinstallcheck_test ( TriangularComplexMatrix_std )
+
+ # Func
+-ot_pyinstallcheck_test ( WrapperFile_std )
++#DEB#ot_pyinstallcheck_test ( WrapperFile_std ) # Does not work when installing in DESTDIR
+ ot_pyinstallcheck_test ( NumericalMathFunction_std )
+ ot_pyinstallcheck_test ( NumericalMathFunction_grad )
+ ot_pyinstallcheck_test ( NumericalMathFunction_hess )
Modified: packages/openturns/trunk/debian/patches/ftbfs-4.7.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/ftbfs-4.7.patch?rev=44802&op=diff
==============================================================================
--- packages/openturns/trunk/debian/patches/ftbfs-4.7.patch (original)
+++ packages/openturns/trunk/debian/patches/ftbfs-4.7.patch Tue May 15 20:19:55 2012
@@ -1,48 +1,20 @@
---- openturns-0.15.orig/lib/include/OTtestcode.hxx
-+++ openturns-0.15/lib/include/OTtestcode.hxx
-@@ -196,6 +196,22 @@
-
-
- /**
-+ * @fn streamObject(const T & anObject)
-+ *
-+ * Try to stream an object onto an ostream object (std::cout).
-+ * This method tests the operator << of the object.
-+ */
-+ template <class T>
-+ void streamObject(const T & anObject)
-+ {
-+ std::cout << "streamObject(const T & anObject)"
-+ << std::endl;
-+ OT::Base::Common::OStream fullprint(std::cout);
-+ fullprint << anObject << std::endl;
-+ }
-+
-+
-+ /**
- * @fn checkNameConstructor()
- *
- * Try to instanciate an object with a name.
-@@ -216,22 +232,6 @@
- }
-
-
-- /**
-- * @fn streamObject(const T & anObject)
-- *
-- * Try to stream an object onto an ostream object (std::cout).
-- * This method tests the operator << of the object.
-- */
-- template <class T>
-- void streamObject(const T & anObject)
-- {
-- std::cout << "streamObject(const T & anObject)"
-- << std::endl;
-- OT::Base::Common::OStream fullprint(std::cout);
-- fullprint << anObject << std::endl;
-- }
--
--
- /**
- * @fn areSameObjects(const T & firstObject, const T & secondObject)
- *
+Description: Fix FTBFS with g++ 4.7
+Author: Denis Barbier <bouzim at gmail.com>
+
+---
+
+Origin: Debian
+Forwarded: no
+Last-Update: 2012-05-14
+
+--- openturns-1.0.orig/lib/src/Base/Func/MuParser/muParserTemplateMagic.h
++++ openturns-1.0/lib/src/Base/Func/MuParser/muParserTemplateMagic.h
+@@ -106,7 +106,7 @@
+ static T Exp(T v) { return exp(v); }
+ static T Erf(T v) { return erf(v); } // OT modification
+ static T Erfc(T v) { return erfc(v); } // OT modification
+- static T Abs(T v) { return abs(v); } // OT modification
++ static T Abs(T v) { return fabs(v); } // OT modification
+ static T Sqrt(T v) { return sqrt(v); }
+ static T Cbrt(T v) { return cbrt(v); } // OT modification
+ static T J0(T v) { return j0(v); } // OT modification
Added: packages/openturns/trunk/debian/patches/installcheck.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/installcheck.patch?rev=44802&op=file
==============================================================================
--- packages/openturns/trunk/debian/patches/installcheck.patch (added)
+++ packages/openturns/trunk/debian/patches/installcheck.patch Tue May 15 20:19:55 2012
@@ -1,0 +1,42 @@
+--- openturns-1.0.orig/lib/test/CMakeLists.txt
++++ openturns-1.0/lib/test/CMakeLists.txt
+@@ -27,13 +27,13 @@
+
+ #include ( CTest )
+
+-set ( NEW_PATH "$ENV{PATH}:${EXAMPLE_PATH}" )
++set ( NEW_PATH "$ENV{PATH}:${INSTALL_DESTDIR}${EXAMPLE_PATH}" )
+
+ set ( CHECK_ENVIRONMENT "OPENTURNS_CONFIG_PATH=${CMAKE_BINARY_DIR}/lib/etc" )
+
+-set ( INSTALLCHECK_ENVIRONMENT "OPENTURNS_WRAPPER_PATH=${WRAPPER_PATH}"
+- "OPENTURNS_CONFIG_PATH=${SYSCONFIG_PATH}/openturns"
+- "OPENTURNS_NUMERICALSAMPLE_PATH=${SAMPLE_PATH}"
++set ( INSTALLCHECK_ENVIRONMENT "OPENTURNS_WRAPPER_PATH=${INSTALL_DESTDIR}${WRAPPER_PATH}"
++ "OPENTURNS_CONFIG_PATH=${INSTALL_DESTDIR}${SYSCONFIG_PATH}/openturns"
++ "OPENTURNS_NUMERICALSAMPLE_PATH=${INSTALL_DESTDIR}${SAMPLE_PATH}"
+ "PATH=${NEW_PATH}"
+ )
+
+--- openturns-1.0.orig/python/test/CMakeLists.txt
++++ openturns-1.0/python/test/CMakeLists.txt
+@@ -27,13 +27,14 @@
+
+ #include ( CTest )
+
+-set ( NEW_PATH "$ENV{PATH}:${EXAMPLE_PATH}" )
++set ( NEW_PATH "$ENV{PATH}:${INSTALL_DESTDIR}${EXAMPLE_PATH}" )
+
+-set ( PYINSTALLCHECK_ENVIRONMENT "OPENTURNS_WRAPPER_PATH=${WRAPPER_PATH}"
+- "OPENTURNS_CONFIG_PATH=${SYSCONFIG_PATH}/openturns"
+- "OPENTURNS_NUMERICALSAMPLE_PATH=${SAMPLE_PATH}"
++set ( PYINSTALLCHECK_ENVIRONMENT "OPENTURNS_WRAPPER_PATH=${INSTALL_DESTDIR}${WRAPPER_PATH}"
++ "OPENTURNS_CONFIG_PATH=${INSTALL_DESTDIR}${SYSCONFIG_PATH}/openturns"
++ "OPENTURNS_NUMERICALSAMPLE_PATH=${INSTALL_DESTDIR}${SAMPLE_PATH}"
+ "PATH=${NEW_PATH}"
+- "PYTHONPATH=${PYTHON_MODULE_PATH}"
++ "LD_LIBRARY_PATH=${INSTALL_DESTDIR}${LIBRARY_PATH}"
++ "PYTHONPATH=${INSTALL_DESTDIR}${PYTHON_MODULE_PATH}"
+ )
+
+ # This macro compiles on the fly and run the corresponding post-installation test
Added: packages/openturns/trunk/debian/patches/no-link-python.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/no-link-python.patch?rev=44802&op=file
==============================================================================
--- packages/openturns/trunk/debian/patches/no-link-python.patch (added)
+++ packages/openturns/trunk/debian/patches/no-link-python.patch Tue May 15 20:19:55 2012
@@ -1,0 +1,15 @@
+Do not link against python libraries, otherwise module cannot be loaded.
+
+See http://bugs.debian.org/670066
+
+--- openturns-1.0.orig/python/src/CMakeLists.txt
++++ openturns-1.0/python/src/CMakeLists.txt
+@@ -67,7 +67,7 @@ macro ( ot_add_python_module MODULENAME SOURCEFILE )
+ swig_add_module ( ${MODULENAME} python ${SOURCEFILE} ${swig_other_sources} )
+
+ add_dependencies ( ${SWIG_MODULE_${MODULENAME}_REAL_NAME} generate_swig_runtime )
+- swig_link_libraries ( ${MODULENAME} OT ${PYTHON_LIBRARIES} )
++ swig_link_libraries ( ${MODULENAME} OT )
+ list ( APPEND OPENTURNS_PYTHON_MODULES ${MODULENAME} )
+ endmacro ( ot_add_python_module )
+
Modified: packages/openturns/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/series?rev=44802&op=diff
==============================================================================
--- packages/openturns/trunk/debian/patches/series (original)
+++ packages/openturns/trunk/debian/patches/series Tue May 15 20:19:55 2012
@@ -4,3 +4,8 @@
#openturns-python26.diff
#pth.diff
ftbfs-4.7.patch
+cmake-configdir.patch
+no-link-python.patch
+installcheck.patch
+disable-test-wrapper.patch
+debian-soname.patch
Added: packages/openturns/trunk/debian/python-openturns-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/python-openturns-dev.install?rev=44802&op=file
==============================================================================
--- packages/openturns/trunk/debian/python-openturns-dev.install (added)
+++ packages/openturns/trunk/debian/python-openturns-dev.install Tue May 15 20:19:55 2012
@@ -1,0 +1,1 @@
+usr/include/openturns/swig
Modified: packages/openturns/trunk/debian/python-openturns.install
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/python-openturns.install?rev=44802&op=diff
==============================================================================
--- packages/openturns/trunk/debian/python-openturns.install (original)
+++ packages/openturns/trunk/debian/python-openturns.install Tue May 15 20:19:55 2012
@@ -1,2 +1,2 @@
-usr/lib/python*/*-packages/openturns/*.py usr/share/pyshared/openturns/
-usr/lib/python2.7/*-packages/openturns/*.so* usr/lib/pyshared/python2.7/openturns/
+usr/lib/python*/*-packages/openturns/*.py
+usr/lib/python*/*-packages/openturns/*.so
Modified: packages/openturns/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/rules?rev=44802&op=diff
==============================================================================
--- packages/openturns/trunk/debian/rules (original)
+++ packages/openturns/trunk/debian/rules Tue May 15 20:19:55 2012
@@ -5,68 +5,82 @@
endif
$(info DEB_BUILD_OPTIONS:$(origin DEB_BUILD_OPTIONS)=$(DEB_BUILD_OPTIONS))
-export CFLAGS= -g -O2
-export CXXFLAGS= -g -O2
-export FFLAGS= -g -O2
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ test_makeflags = -j$(NUMJOBS)
+endif
-export CPPFLAGS= -DOT_DEBUG_LEVEL=3
-ifeq ($(shell dpkg --print-architecture),hppa)
- CPPFLAGS += -DBOOST_SP_USE_PTHREADS
-endif
-ifeq ($(shell dpkg --print-architecture),arm)
- CPPFLAGS += -DBOOST_SP_USE_PTHREADS
-endif
+cflags := $(shell dpkg-buildflags --get CFLAGS)
+cxxflags := $(shell dpkg-buildflags --get CXXFLAGS)
+fflags := $(shell dpkg-buildflags --get FFLAGS)
+ldflags := $(shell dpkg-buildflags --get LDFLAGS)
+ldflags += -Wl,--as-needed
+
ifeq ($(shell dpkg --print-architecture),armel)
- CPPFLAGS += -DBOOST_SP_USE_PTHREADS
- CFLAGS= -g -O1
- CXXFLAGS= -g -O1
- FFLAGS= -g -O1
+ cflags := $(subst -O2,-O1,$(cflags))
+ cxxflags := $(subst -O2,-O1,$(cxxflags))
+ fflags := $(subst -O2,-O1,$(fflags))
endif
ifeq ($(shell dpkg --print-architecture),armhf)
- CPPFLAGS += -DBOOST_SP_USE_PTHREADS
- CFLAGS= -g -O1
- CXXFLAGS= -g -O1
- FFLAGS= -g -O1
+ cflags := $(subst -O2,-O1,$(cflags))
+ cxxflags := $(subst -O2,-O1,$(cxxflags))
+ fflags := $(subst -O2,-O1,$(fflags))
endif
-ifeq ($(shell dpkg --print-architecture),sparc)
- CPPFLAGS += -DBOOST_SP_USE_PTHREADS
+ifeq ($(shell dpkg --print-architecture),i386)
+ cflags += -fno-cse-follow-jumps
+endif
+ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64 ia64 powerpc ppc64))
+ with_tbb := -DUSE_TBB:BOOL=ON
+else
+ with_tbb := -DUSE_TBB:BOOL=OFF
endif
-LDFLAGS += -Wl,--as-needed
+# Explicitly set builddir directory
+builddir := obj-$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export CPPFLAGS CFLAGS CXXFLAGS FFLAGS LDFLAGS
-
-# see include /usr/share/R/debian/r-cran.mk
-debRlib := $(CURDIR)/debian/python-openturns/usr/lib/R/site-library
+debRlib := $(CURDIR)/debian/tmp/usr/lib/R/site-library
+export R_LIBS=$(debRlib)
PYVER = $(shell pyversions -dv)
%:
- dh $@ --with python2 --parallel
+ dh $@ --buildsystem=cmake --builddirectory=$(builddir) --with python2 --with quilt --parallel
-override_dh_auto_configure:
+debian/tmp/usr/lib/R/site-library/rotRPackage:
+ -mkdir -p $(debRlib)
+ R CMD INSTALL --library=$(debRlib) utils/rotRPackage_1.4.4.tar.gz
+
+override_dh_auto_configure: debian/tmp/usr/lib/R/site-library/rotRPackage
dh_auto_configure -- \
- --enable-lib --enable-python --enable-doc --disable-debug \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info
+ $(with_tbb) \
+ -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-4.6 \
+ -DCMAKE_Fortran_COMPILER:FILEPATH=/usr/bin/gfortran-4.6 \
+ -DCMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc-4.6 \
+ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING='$(cflags)' \
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING='$(cxxflags)' \
+ -DCMAKE_Fortran_FLAGS_RELWITHDEBINFO:STRING='$(fflags)' \
+ -DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(ldflags)' \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DOPENTURNS_LIBRARY_PATH:PATH=lib \
+ -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc \
+ -DOPENTURNS_SYSTEM_INSTALL:BOOL=ON \
+ -DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/tmp
-override_dh_auto_install:
+override_dh_auto_install: debian/tmp/usr/lib/R/site-library/rotRPackage
dh_auto_install
- find debian/ -name *.pyc -delete
- find debian/ -name *.pyo -delete
- find debian/ -name *.la -delete
- find debian/ -name COPYING* -delete
- find debian/ -name bootstrap -exec chmod a+x {} \;
- find debian/ -name customize -exec chmod a+x {} \;
- find debian/python-openturns/ -name *.so -exec chrpath -d {} \;
+ -mkdir -p debian/tmp/usr/share/openturns/m4
+ cp lib/m4/*.m4 debian/tmp/usr/share/openturns/m4
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ $(MAKE) $(test_makeflags) -C $(builddir) installcheck
+endif
+ # Fix script permissions
+ chmod a+x debian/tmp/usr/share/openturns/WrapperTemplates/wrapper_*/customize debian/tmp/usr/share/openturns/WrapperTemplates/wrapper_*/bootstrap
override_dh_makeshlibs:
dh_makeshlibs -Xpyshared
override_dh_strip:
- dh_strip -plibopenturns0 --dbg-package=libopenturns-dbg
+ dh_strip -plibopenturns0.1 --dbg-package=libopenturns-dbg
dh_strip
override_dh_python2:
@@ -76,7 +90,14 @@
dh_compress -X.pdf -X.svn -X.py
override_dh_auto_test:
- -dh_auto_test
+ # Call 'make check' explicitly, 'make test' does not build binary tests
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ $(MAKE) $(test_makeflags) -C $(builddir) check
+endif
+
+override_dh_auto_clean:
+ dh_auto_clean
+ -rm -f python/test/PyNMF.pyc python/test/PyNMF.pyo
get-orig-source:
uscan --force-download --verbose
More information about the debian-science-commits
mailing list