[openturns] 01/04: Copy debian/* files from upstream distro/debian/
Denis Barbier
barbier-guest at moszumanska.debian.org
Fri Jul 25 22:37:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
barbier-guest pushed a commit to branch debian
in repository openturns.
commit 32461768a9d47565f0bdea533ef718ab7adb2c99
Author: Denis Barbier <bouzim at gmail.com>
Date: Fri Jul 25 18:33:41 2014 +0200
Copy debian/* files from upstream distro/debian/
---
debian/changelog | 15 ++++++
debian/control | 6 +--
...penturns0.4.install => libopenturns0.5.install} | 0
...overrides => libopenturns0.5.lintian-overrides} | 0
debian/patches/series | 1 -
debian/patches/tests-disable-broken-R.patch | 59 ----------------------
debian/patches/tests-disable-coupling_tools.patch | 14 ++---
debian/rules | 16 ++++--
8 files changed, 36 insertions(+), 75 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 334a50b..030ce5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+openturns (1.4-1) unstable; urgency=low
+
+ [ Julien Schueller ]
+ * New upstream release.
+
+ -- Denis Barbier <barbier at debian.org> Thu, 25 Jul 2014 21:34:47 +0200
+
+openturns (1.4~rc1-1) experimental; urgency=low
+
+ [ Julien Schueller ]
+ * New upstream pre-release.
+ * Set CMAKE_INSTALL_LIBDIR overriden by Ubuntu
+
+ -- Denis Barbier <barbier at debian.org> Wed, 02 Jul 2014 10:34:47 +0200
+
openturns (1.3-2) unstable; urgency=medium
* tests-disable-broken-R.patch: New patch, to disable 3
diff --git a/debian/control b/debian/control
index e5a9434..7256f76 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,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.4
+Package: libopenturns0.5
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -49,7 +49,7 @@ Description: dynamic libraries for OpenTURNS
Package: libopenturns-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libopenturns0.4 (= ${binary:Version}),
+Depends: ${misc:Depends}, libopenturns0.5 (= ${binary:Version}),
libmuparser-dev, libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64]
Replaces: openturns-wrapper
Breaks: openturns-wrapper
@@ -92,7 +92,7 @@ Description: debug symbols for OpenTURNS
Package: python-openturns
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.4 (= ${binary:Version}), ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.5 (= ${binary:Version}), ${python:Depends}
Provides: ${python:Provides}
Suggests: python-matplotlib, python-scipy
Description: Python front-end of OpenTURNS (aka TUI)
diff --git a/debian/libopenturns0.4.install b/debian/libopenturns0.5.install
similarity index 100%
rename from debian/libopenturns0.4.install
rename to debian/libopenturns0.5.install
diff --git a/debian/libopenturns0.4.lintian-overrides b/debian/libopenturns0.5.lintian-overrides
similarity index 100%
rename from debian/libopenturns0.4.lintian-overrides
rename to debian/libopenturns0.5.lintian-overrides
diff --git a/debian/patches/series b/debian/patches/series
index b8c6184..8a2a9c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
tests-disable-coupling_tools.patch
-tests-disable-broken-R.patch
diff --git a/debian/patches/tests-disable-broken-R.patch b/debian/patches/tests-disable-broken-R.patch
deleted file mode 100644
index 1e9296d..0000000
--- a/debian/patches/tests-disable-broken-R.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Disable several rot tests
- There are regressions in R 3.1.0
-Author: Denis Barbier
-Origin: Debian
-Bug: http://trac.openturns.org/ticket/706
-Bug-Debian: http://bugs.debian.org/743073
-Last-Update: 2014-04-19
-
-Index: openturns/lib/test/CMakeLists.txt
-===================================================================
---- openturns.orig/lib/test/CMakeLists.txt 2014-04-19 23:39:18.505821194 +0200
-+++ openturns/lib/test/CMakeLists.txt 2014-04-19 23:39:18.497821154 +0200
-@@ -550,7 +550,7 @@
- ot_check_test ( TruncatedDistribution_std )
- ot_check_test ( TruncatedNormal_std )
- if ( R_rot_FOUND )
--ot_check_test ( TruncatedNormalFactory_std )
-+#DEB#ot_check_test ( TruncatedNormalFactory_std )
- endif ()
- ot_check_test ( Uniform_std )
- ot_check_test ( UniformFactory_std )
-@@ -698,9 +698,9 @@
- if ( R_rot_FOUND )
- ot_check_test ( VisualTest_std )
- ot_check_test ( FittingTest_std )
--ot_check_test ( HypothesisTest_std )
-+#DEB#ot_check_test ( HypothesisTest_std )
- # ot_check_test ( HypothesisTest_correlation )
--ot_check_test ( LinearModelTest_std )
-+#DEB#ot_check_test ( LinearModelTest_std )
- ot_check_test ( NormalityTest_std )
- endif ()
- #ot_check_test ( DickeyFullerTest_std )
-Index: openturns/python/test/CMakeLists.txt
-===================================================================
---- openturns.orig/python/test/CMakeLists.txt 2014-04-19 23:39:16.149809511 +0200
-+++ openturns/python/test/CMakeLists.txt 2014-04-19 23:40:44.462247429 +0200
-@@ -477,7 +477,7 @@
- ot_pyinstallcheck_test ( TruncatedDistribution_std )
- ot_pyinstallcheck_test ( TruncatedNormal_std )
- if ( R_rot_FOUND )
--ot_pyinstallcheck_test ( TruncatedNormalFactory_std )
-+#DEB#ot_pyinstallcheck_test ( TruncatedNormalFactory_std )
- endif ( R_rot_FOUND )
- ot_pyinstallcheck_test ( Uniform_std )
- ot_pyinstallcheck_test ( UniformFactory_std )
-@@ -594,10 +594,10 @@
- if ( R_rot_FOUND )
- ot_pyinstallcheck_test ( VisualTest_std )
- ot_pyinstallcheck_test ( FittingTest_std )
--ot_pyinstallcheck_test ( HypothesisTest_std )
-+#DEB#ot_pyinstallcheck_test ( HypothesisTest_std )
- # ot_pyinstallcheck_test ( HypothesisTest_correlation )
- ot_pyinstallcheck_test ( NormalityTest_std )
--ot_pyinstallcheck_test ( LinearModelTest_std )
-+#DEB#ot_pyinstallcheck_test ( LinearModelTest_std )
- endif ()
- #ot_pyinstallcheck_test ( DickeyFullerTest_std )
-
diff --git a/debian/patches/tests-disable-coupling_tools.patch b/debian/patches/tests-disable-coupling_tools.patch
index 0dae6e3..3534dde 100644
--- a/debian/patches/tests-disable-coupling_tools.patch
+++ b/debian/patches/tests-disable-coupling_tools.patch
@@ -3,18 +3,18 @@ Description: Disable coupling_tools test
Author: Denis Barbier
Origin: Debian
Forwarded: No
-Last-Update: 2013-06-25
+Last-Update: 2014-07-02
Index: openturns/python/test/CMakeLists.txt
===================================================================
--- 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 )
+@@ -624,7 +624,7 @@
--ot_pyinstallcheck_test ( coupling_tools )
+ # 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 )
+ endif ()
-
- add_custom_target ( pyinstallcheck COMMAND ${CMAKE_CTEST_COMMAND} -R "^pyinstallcheck_"
+ if (MATPLOTLIB_FOUND AND R_rot_FOUND)
diff --git a/debian/rules b/debian/rules
index dbcf3e8..194c6ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,10 +79,11 @@ 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 \
- -DLIB_SOVERSION=0.4 \
- -DLIB_VERSION=0.4.0 \
- -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.3 \
- -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.3/wrappers \
+ -DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
+ -DLIB_SOVERSION=0.5 \
+ -DLIB_VERSION=0.5.0 \
+ -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.4 \
+ -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.4/wrappers \
-DSYSTEM_INSTALL:BOOL=ON \
-DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/tmp \
-DLINK_PYTHON_LIBRARY:BOOL=OFF \
@@ -91,6 +92,11 @@ override_dh_auto_configure: debian/tmp/usr/lib/R/site-library/rot
-DPYTHON_INCLUDE_DIR2:PATH=$$(python$(PYVER)-config --includes | sed -e 's/ .*//' -e 's/^-I//') \
-DPYTHON_LIBRARY:PATH=$$(python$(PYVER)-config --ldflags | sed -e 's/ .*//' -e 's/^-L//')/libpython$(PYVER).so
+override_dh_auto_build:
+ $(MAKE) $(test_makeflags) -C $(builddir)/lib
+ $(MAKE) -j1 -C $(builddir)/python
+ $(MAKE) $(test_makeflags) -C $(builddir)
+
override_dh_auto_install: debian/tmp/usr/lib/R/site-library/rot
dh_auto_install
mkdir -p debian/libopenturns-dbg/usr/lib/debug/usr/lib
@@ -108,7 +114,7 @@ override_dh_makeshlibs:
dh_makeshlibs -Xpyshared
override_dh_strip:
- dh_strip -plibopenturns0.4 --dbg-package=libopenturns-dbg
+ dh_strip -plibopenturns0.5 --dbg-package=libopenturns-dbg
dh_strip
override_dh_python2:
--
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