[SCM] Debian packaging for openturns www.openturns.org branch, debian, updated. debian/1.1-4-1-g6107fbe
Denis Barbier
bouzim at gmail.com
Thu Jun 27 23:50:21 UTC 2013
The following commit has been merged in the debian branch:
commit 6107fbe26d62460f91b44e13db6830b89ddef8d9
Author: Denis Barbier <bouzim at gmail.com>
Date: Mon Jun 24 22:17:28 2013 +0200
Copy upstream changes from distro/debian, by Julien Schueller
* New upstream version 1.2rc1
* Drop patches merged upstream:
add-missing-header-file.patch debian-soname.patch
fix-swig-warning.patch ftbfs-bison-2.7.patch
* Launch tests in parallel
Minor changes by myself.
diff --git a/debian/changelog b/debian/changelog
index e4a3cfd..bc6b910 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+openturns (1.2~rc1-1) experimental-UNRELEASED; urgency=low
+
+ [Julien Schueller]
+ * New upstream version 1.2rc1
+ * Bump soname to 0.3
+ * Drop patches merged upstream:
+ add-missing-header-file.patch debian-soname.patch
+ fix-swig-warning.patch ftbfs-bison-2.7.patch
+ * Launch tests in parallel
+
+ -- Denis Barbier <barbier at debian.org> Fri, 28 Jun 2013 01:51:22 +0200
+
openturns (1.1-4) unstable; urgency=low
* Upload into unstable
diff --git a/debian/control b/debian/control
index a910d54..533125d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/opentur
Vcs-Git: git://anonscm.debian.org/debian-science/packages/openturns.git
X-Python-Version: current
-Package: libopenturns0.2
+Package: libopenturns0.3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,7 +45,7 @@ Description: dynamic libraries for OpenTURNS
Package: libopenturns-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libopenturns0.2 (= ${binary:Version})
+Depends: ${misc:Depends}, libopenturns0.3 (= ${binary:Version})
Replaces: openturns-wrapper
Breaks: openturns-wrapper
Description: headers and development libraries for OpenTURNS
@@ -87,7 +87,7 @@ Description: debug symbols for OpenTURNS
Package: python-openturns
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.2 (= ${binary:Version}), ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.3 (= ${binary:Version}), ${python:Depends}
Provides: ${python:Provides}
Suggests: python-matplotlib, python-scipy
Description: Python front-end of OpenTURNS (aka TUI)
diff --git a/debian/libopenturns-dev.install b/debian/libopenturns-dev.install
index 67eb1a5..861c3ec 100644
--- a/debian/libopenturns-dev.install
+++ b/debian/libopenturns-dev.install
@@ -1,6 +1,5 @@
usr/bin/*
usr/lib/libOT*.so
usr/lib/cmake/openturns/*.cmake
-usr/share/openturns/m4/*
usr/include/openturns/*.h*
usr/share/openturns/WrapperTemplates
diff --git a/debian/libopenturns0.2.install b/debian/libopenturns0.3.install
similarity index 100%
rename from debian/libopenturns0.2.install
rename to debian/libopenturns0.3.install
diff --git a/debian/libopenturns0.2.lintian-overrides b/debian/libopenturns0.3.lintian-overrides
similarity index 100%
rename from debian/libopenturns0.2.lintian-overrides
rename to debian/libopenturns0.3.lintian-overrides
diff --git a/debian/patches/add-missing-header-file.patch b/debian/patches/add-missing-header-file.patch
deleted file mode 100644
index 4283415..0000000
--- a/debian/patches/add-missing-header-file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Add missing header file
-Author: Julien Schueller
-Origin: upstream
-Applied-Upstream: http://trac.openturns.org/changeset/3030
-Last-Update: 2013-02-02
-
-Index: openturns/lib/src/Base/Common/CMakeLists.txt
-===================================================================
---- openturns.orig/lib/src/Base/Common/CMakeLists.txt
-+++ openturns/lib/src/Base/Common/CMakeLists.txt
-@@ -107,6 +107,7 @@ ot_install_header_file ( WrapperInterfac
- ot_install_header_file ( WrapperCommon.h )
- ot_install_header_file ( WrapperCommon_macros.h )
- ot_install_header_file ( WrapperCommon_static.h )
-+ot_install_header_file ( WrapperCommon_extern.h )
- ot_install_header_file ( WrapperMacros.h )
-
- if (LIBXML2_FOUND)
diff --git a/debian/patches/debian-soname.patch b/debian/patches/debian-soname.patch
deleted file mode 100644
index a857981..0000000
--- a/debian/patches/debian-soname.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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: not-needed
-Last-Update: 2012-05-13
-
-Index: openturns/lib/src/CMakeLists.txt
-===================================================================
---- openturns.orig/lib/src/CMakeLists.txt
-+++ openturns/lib/src/CMakeLists.txt
-@@ -72,8 +72,8 @@ if ( MINGW )
- LINK_FLAGS "-Wl,--out-implib,libOTbind.dll.a" )
- endif ( MINGW )
- 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.2 )
-+set_target_properties ( OT OTbind PROPERTIES VERSION 0.2.0 )
- if ( BISON_FOUND )
- add_dependencies ( OT generate_csv_parser )
- endif ( BISON_FOUND )
diff --git a/debian/patches/fix-swig-warning.patch b/debian/patches/fix-swig-warning.patch
deleted file mode 100644
index 528a779..0000000
--- a/debian/patches/fix-swig-warning.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Description: Fix warnings with SWIG 2.0.9
- UserDefined.i causes test failures:
- 159 - pyinstallcheck_StandardEvent_std (Failed)
- 281 - pyinstallcheck_UserDefined_std (Failed)
- 363 - pyinstallcheck_FittingTest_std (Failed)
- 365 - pyinstallcheck_NormalityTest_std (Failed)
-Author: Julien Schueller
-Origin: Vendor
-Applied-Upstream: http://trac.openturns.org/changeset/3044
-Last-Update: 2013-03-05
-
-Index: openturns/python/src/ComposedCopula.i
-===================================================================
---- openturns.orig/python/src/ComposedCopula.i 2013-05-30 23:47:53.351894608 +0200
-+++ openturns/python/src/ComposedCopula.i 2013-05-30 23:47:53.347894588 +0200
-@@ -21,17 +21,21 @@
-
- }
-
-+namespace OT {
-
--%extend OT::ComposedCopula
--{
-+%extend ComposedCopula {
-
--OT::ComposedCopula(PyObject * pyObj)
-+ComposedCopula(PyObject * pyObj)
- {
-- OT::Pointer<OT::Collection<OT::Copula> > p_coll = OT::buildCollectionFromPySequence<OT::Copula>( pyObj );
-- return new OT::ComposedCopula( *p_coll );
-+ OT::Pointer<OT::Collection<OT::Copula> > p_coll = OT::buildCollectionFromPySequence<OT::Copula>( pyObj );
-+ return new OT::ComposedCopula( *p_coll );
- }
-
-+ComposedCopula(const ComposedCopula & other)
-+{
-+ return new OT::ComposedCopula(other);
- }
-
--
--namespace OT { %extend ComposedCopula { ComposedCopula(const ComposedCopula & other) { return new OT::ComposedCopula(other); } } }
-+} // ComposedCopula
-+
-+} // OT
-Index: openturns/python/src/UserDefined.i
-===================================================================
---- openturns.orig/python/src/UserDefined.i 2013-05-30 23:47:53.351894608 +0200
-+++ openturns/python/src/UserDefined.i 2013-05-30 23:47:53.347894588 +0200
-@@ -2,35 +2,45 @@
- // @author schueller
- // @date 2012-01-02 11:44:01 +0100 (Mon, 02 Jan 2012)
-
-+
-+
- %{
-+#include "PythonWrappingFunctions.hxx"
- #include "UserDefined.hxx"
- %}
-
--%include UserDefined.hxx
-+%template(UserDefinedPairCollection) OT::Collection<OT::UserDefinedPair>;
-
--%template(UserDefinedPairCollection_) OT::Collection<OT::UserDefinedPair>;
--%template(UserDefinedPairCollection) OT::PersistentCollection<OT::UserDefinedPair>;
-+%include UserDefined.hxx
-
--%extend OT::PersistentCollection<OT::UserDefinedPair>
-+%extend OT::Collection<OT::UserDefinedPair>
- {
-
--OT::PersistentCollection<OT::UserDefinedPair>::OT::PersistentCollection<OT::UserDefinedPair> (PyObject * pyObj)
-+OT::Collection<OT::UserDefinedPair> (PyObject * pyObj)
- {
-- OT::Pointer<OT::Collection<OT::UserDefinedPair> > ptr = OT::buildCollectionFromPySequence<OT::UserDefinedPair>( pyObj );
-- return new OT::PersistentCollection<OT::UserDefinedPair>(ptr->begin(), ptr->end());
-+ return OT::buildCollectionFromPySequence<OT::UserDefinedPair>( pyObj );
- }
-
- }
-
-+
- namespace OT {
-
- %extend UserDefined {
-- UserDefined(const OT::Collection<OT::UserDefinedPair> & collection)
-- {
-- return new OT::UserDefined(collection);
-- }
--}
-
-+UserDefined(const UserDefined & other)
-+{
-+ return new OT::UserDefined(other);
-+}
-+
-+UserDefined(PyObject * pyObj)
-+{
-+ OT::Pointer<OT::Collection<OT::UserDefinedPair> > p_coll = OT::buildCollectionFromPySequence<OT::UserDefinedPair>( pyObj );
-+ return new OT::UserDefined( *p_coll );
- }
-
--namespace OT { %extend UserDefined { UserDefined(const UserDefined & other) { return new OT::UserDefined(other); } } }
-+
-+} // UserDefined
-+
-+} // OT
-+
diff --git a/debian/patches/ftbfs-bison-2.7.patch b/debian/patches/ftbfs-bison-2.7.patch
deleted file mode 100644
index 29a16ee..0000000
--- a/debian/patches/ftbfs-bison-2.7.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Fix build failures with Bison >= 2.7
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Debian
-Forwarded: http://trac.openturns.org/ticket/630
-Applied-Upstream: http://trac.openturns.org/changeset/3023
-Last-Update: 2012-05-26
-
-Index: openturns/lib/src/Base/Stat/csv_parser.yy
-===================================================================
---- openturns.orig/lib/src/Base/Stat/csv_parser.yy 2013-05-26 22:25:43.759605421 +0200
-+++ openturns/lib/src/Base/Stat/csv_parser.yy 2013-05-26 22:25:56.463668417 +0200
-@@ -24,6 +24,15 @@
-
- /* This parser is based on RFC 4180 from www.ietf.org */
-
-+%code requires {
-+#include <string>
-+#include "csv_parser_state.hxx"
-+#include "NumericalSampleImplementation.hxx"
-+#include "Log.hxx"
-+
-+typedef void* yyscan_t;
-+}
-+
- %pure-parser
- %parse-param {OT::CSVParserState & theState}
- %parse-param {yyscan_t yyscanner}
-@@ -62,12 +71,6 @@
-
-
- %{
--#include <string>
--#include "csv_parser_state.hxx"
--#include "NumericalSampleImplementation.hxx"
--#include "Log.hxx"
--
--typedef void* yyscan_t;
- int yylex (YYSTYPE *lvalp, yyscan_t yyscanner, FILE * theFile, const char * theSeparator);
- int yyerror (OT::CSVParserState & theState, yyscan_t yyscanner, FILE * theFile, OT::NumericalSampleImplementation &impl, OT::UnsignedLong & theDimension, const char * theSeparator, const char *s);
- int csvget_lineno (yyscan_t yyscanner);
diff --git a/debian/patches/series b/debian/patches/series
index 3cf78b5..9a8a973 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
-debian-soname.patch
fix-bigendian.patch
-add-missing-header-file.patch
-tests-disable-timing.patch
tests-disable-distributed_python_wrapper.patch
remove-soname-python-module.patch
-ftbfs-bison-2.7.patch
-fix-swig-warning.patch
diff --git a/debian/patches/tests-disable-distributed_python_wrapper.patch b/debian/patches/tests-disable-distributed_python_wrapper.patch
index 11ce837..95d0be3 100644
--- a/debian/patches/tests-disable-distributed_python_wrapper.patch
+++ b/debian/patches/tests-disable-distributed_python_wrapper.patch
@@ -3,32 +3,18 @@ Description: Disable distributed python wrapper tests
Author: Denis Barbier
Origin: Debian
Forwarded: No
-Last-Update: 2013-05-26
+Last-Update: 2013-06-25
Index: openturns/python/test/CMakeLists.txt
===================================================================
---- openturns.orig/python/test/CMakeLists.txt 2013-01-03 16:32:58.000000000 +0100
-+++ openturns/python/test/CMakeLists.txt 2013-05-26 10:19:45.031609353 +0200
-@@ -644,14 +644,14 @@
+--- openturns.orig/python/test/CMakeLists.txt (révision 3135)
++++ openturns/python/test/CMakeLists.txt (copie de travail)
+@@ -651,7 +651,7 @@
+ endif ()
+ ot_pyinstallcheck_test ( QuickTest IGNOREOUT )
-
- ## Distributed python wrapper
-ot_pyinstallcheck_test ( coupling_tools )
--ot_pyinstallcheck_test ( wrapper_data )
--ot_pyinstallcheck_test ( distributed_python_wrapper_std PARAMS "${CMAKE_CURRENT_SOURCE_DIR}" )
--ot_pyinstallcheck_test ( distributed_python_wrapper_template PARAMS "${CMAKE_CURRENT_SOURCE_DIR}" )
--if ( ENABLE_DISTRIBUTED_TEST )
-- ot_pyinstallcheck_test ( remote_communicator )
-- ot_pyinstallcheck_test ( distributed_python_wrapper_remote PARAMS "${CMAKE_CURRENT_SOURCE_DIR}" )
--endif ( ENABLE_DISTRIBUTED_TEST )
-+#ot_pyinstallcheck_test ( coupling_tools )
-+#ot_pyinstallcheck_test ( wrapper_data )
-+#ot_pyinstallcheck_test ( distributed_python_wrapper_std PARAMS "${CMAKE_CURRENT_SOURCE_DIR}" )
-+#ot_pyinstallcheck_test ( distributed_python_wrapper_template PARAMS "${CMAKE_CURRENT_SOURCE_DIR}" )
-+#if ( ENABLE_DISTRIBUTED_TEST )
-+# ot_pyinstallcheck_test ( remote_communicator )
-+# ot_pyinstallcheck_test ( distributed_python_wrapper_remote PARAMS "${CMAKE_CURRENT_SOURCE_DIR}" )
-+#endif ( ENABLE_DISTRIBUTED_TEST )
++#DEB#ot_pyinstallcheck_test ( coupling_tools )
+
add_custom_target ( pyinstallcheck COMMAND ${CMAKE_CTEST_COMMAND} -R "^pyinstallcheck_"
- DEPENDS ${PYINSTALLCHECK_TO_BE_RUN}
diff --git a/debian/patches/tests-disable-timing.patch b/debian/patches/tests-disable-timing.patch
deleted file mode 100644
index d295897..0000000
--- a/debian/patches/tests-disable-timing.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Disable test timing.
- Tests are much slower on Hurd and package FTBFS because of these timings.
-Author: Denis Barbier
-Origin: Debian
-Forwarded: http://trac.openturns.org/ticket/600
-Last-Update: 2013-02-02
-
-Index: openturns/python/test/t_coupling_tools.py
-===================================================================
---- openturns.orig/python/test/t_coupling_tools.py
-+++ openturns/python/test/t_coupling_tools.py
-@@ -13,7 +13,8 @@ parsed = '# ooo\nE=1.6\nE1=1.6\nFE1=5#oo
- # how many Mo for perf file
- #howbig = 3024
- howbig = 256
--max_time = divmod(howbig, 5)[0]
-+# Disable test timing
-+max_time = sys.maxint
-
-
- def create_template():
diff --git a/debian/rules b/debian/rules
index 2347965..8e4be82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,12 +63,13 @@ override_dh_auto_configure: debian/tmp/usr/lib/R/site-library/rot
-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(ldflags)' \
-DCMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(ldflags)' \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DOPENTURNS_LIBRARY_PATH:PATH=lib \
- -DOPENTURNS_CONFIG_CMAKE_PATH:PATH=lib/cmake/openturns \
- -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.1 \
- -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.1/wrappers \
- -DOPENTURNS_SYSTEM_INSTALL:BOOL=ON \
+ -DLIB_SOVERSION=0.3 \
+ -DLIB_VERSION=0.3.0 \
+ -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.2 \
+ -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.2/wrappers \
+ -DSYSTEM_INSTALL:BOOL=ON \
-DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/tmp \
+ -DLINK_PYTHON_LIBRARY=OFF \
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python \
-DPYTHON_INCLUDE_DIR:PATH=$$(python$(PYVER)-config --includes | sed -e 's/ .*//' -e 's/^-I//') \
-DPYTHON_INCLUDE_DIR2:PATH=$$(python$(PYVER)-config --includes | sed -e 's/ .*//' -e 's/^-I//') \
@@ -83,22 +84,20 @@ endif
override_dh_auto_install: debian/tmp/usr/lib/R/site-library/rot
dh_auto_install
- -mkdir -p debian/tmp/usr/share/openturns/m4
- cp lib/m4/*.m4 debian/tmp/usr/share/openturns/m4
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.
[ -z "$$LD_LIBRARY_PATH" ] || sed -i -e "s#;LD_LIBRARY_PATH=[^;]*#&:$$LD_LIBRARY_PATH#" $(builddir)/python/test/CTestTestfile.cmake
CTEST_OUTPUT_ON_FAILURE=1 \
R_LIBS_SITE=$(CURDIR)/debian/tmp/usr/lib/R/site-library \
- $(MAKE) $(test_makeflags) -C $(builddir) installcheck
+ $(MAKE) $(test_makeflags) -C $(builddir) test ARGS="$(test_makeflags) -R pyinstallcheck"
endif
override_dh_makeshlibs:
dh_makeshlibs -Xpyshared
override_dh_strip:
- dh_strip -plibopenturns0.2 --dbg-package=libopenturns-dbg
+ dh_strip -plibopenturns0.3 --dbg-package=libopenturns-dbg
dh_strip
override_dh_python2:
@@ -108,9 +107,10 @@ override_dh_compress:
dh_compress -X.pdf -X.svn -X.py
override_dh_auto_test:
- # Call 'make check' explicitly, 'make test' does not build binary tests
+ # 'make test' does not build binary tests
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- CTEST_OUTPUT_ON_FAILURE=1 $(MAKE) $(test_makeflags) -C $(builddir) check
+ $(MAKE) $(test_makeflags) -C $(builddir) tests
+ CTEST_OUTPUT_ON_FAILURE=1 $(MAKE) -C $(builddir) test ARGS="$(test_makeflags) -R cppcheck"
endif
get-orig-source:
--
Debian packaging for openturns www.openturns.org
More information about the debian-science-commits
mailing list