[openturns] 04/06: Copy files from upstream distro/debian/ directory

Sun Jun 5 18:00:45 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 33bfffe0e0dd1671bfee5d00801ce31edd72d02c
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sun Jun 5 13:22:28 2016 +0100

    Copy files from upstream distro/debian/ directory
---
 debian/changelog                                   | 14 ++++++++++---
 debian/control                                     | 16 +++++++--------
 debian/libopenturns-dev.install                    |  3 +--
 debian/libopenturns0.7.install                     |  4 ----
 debian/libopenturns0.7.lintian-overrides           |  1 -
 ...0.7-dbg.install => libopenturns0.8-dbg.install} |  0
 debian/libopenturns0.8.install                     |  2 ++
 debian/libopenturns0.8.lintian-overrides           |  1 +
 debian/openturns-examples.install                  |  6 ------
 debian/patches/tests-disable-coupling_tools.patch  |  4 ++--
 debian/rules                                       | 24 +++++++++++-----------
 11 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60ddb34..4bc0f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-openturns (1.6-2) unstable; urgency=medium
+openturns (1.7-1) experimental; urgency=low
 
-  * Upload into unstable.
+  [ Julien Schueller ]
+  * New upstream release.
+
+ -- Denis Barbier <barbier at debian.org>  Wed, 27 Jan 2016 10:14:47 +0100
+
+openturns (1.7~rc1-1) experimental; urgency=low
+
+  [ Julien Schueller ]
+  * New upstream pre-release.
 
- -- Denis Barbier <barbier at debian.org>  Thu, 12 Nov 2015 09:34:17 +0000
+ -- Denis Barbier <barbier at debian.org>  Thu, 10 Dec 2015 18:14:47 +0100
 
 openturns (1.6-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 1fbde9b..1c5091e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Denis Barbier <barbier at debian.org>
 Build-Depends: debhelper (>= 8), quilt, gfortran, bison, flex, cmake, bc,
  libmuparser-dev, libxml2-dev, liblapack-dev, libblas-dev,
- libboost-math-dev, libhmat-oss-dev,
+ libboost-math-dev, libhmat-oss-dev, libnlopt-dev,
  libtbb-dev [i386 amd64 ia64],
  r-base-core, python-dev, python3-dev, swig (>= 2.0.9)
 Standards-Version: 3.9.6
@@ -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.7
+Package: libopenturns0.8
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -50,8 +50,8 @@ Description: dynamic libraries for OpenTURNS
 Package: libopenturns-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libopenturns0.7 (= ${binary:Version}),
-  libmuparser-dev, libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64], libhmat-oss-dev
+Depends: ${misc:Depends}, libopenturns0.8 (= ${binary:Version}),
+  libmuparser-dev, libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64], libhmat-oss-dev, libnlopt-dev
 Replaces: python-openturns-dev (<< 1.5-2)
 Breaks: python-openturns-dev (<< 1.5-2)
 Description: headers and development libraries for OpenTURNS
@@ -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.7-dbg
+Package: libopenturns0.8-dbg
 Section: debug
 Architecture: any
-Depends: libopenturns0.7 (= ${binary:Version}), ${misc:Depends}
+Depends: libopenturns0.8 (= ${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.7 (= ${binary:Version}), ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.8 (= ${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.7 (= ${binary:Version}), ${python3:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.8 (= ${binary:Version}), ${python3:Depends}
 Provides: ${python3:Provides}
 Suggests: python3-matplotlib, python3-scipy
 Description: Python3 front-end of OpenTURNS (aka TUI)
diff --git a/debian/libopenturns-dev.install b/debian/libopenturns-dev.install
index 21718bd..73d3ff9 100644
--- a/debian/libopenturns-dev.install
+++ b/debian/libopenturns-dev.install
@@ -1,6 +1,5 @@
 usr/bin/*
-usr/lib/libOT*.so
+usr/lib/libOT.so
 usr/lib/cmake/openturns/*.cmake
 usr/include/openturns/*.h*
 usr/include/openturns/swig
-usr/share/openturns/WrapperTemplates
diff --git a/debian/libopenturns0.7.install b/debian/libopenturns0.7.install
deleted file mode 100644
index cbcab04..0000000
--- a/debian/libopenturns0.7.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libOT*.so.0*
-usr/lib/openturns-1.*/wrappers/wrapper*.dtd
-usr/lib/openturns-1.*/wrappers/generic.*
-etc/openturns-1.*
diff --git a/debian/libopenturns0.7.lintian-overrides b/debian/libopenturns0.7.lintian-overrides
deleted file mode 100644
index 3e45401..0000000
--- a/debian/libopenturns0.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libopenturns0.7 binary: package-name-doesnt-match-sonames libOT0.7 libOTbind0.7
diff --git a/debian/libopenturns0.7-dbg.install b/debian/libopenturns0.8-dbg.install
similarity index 100%
rename from debian/libopenturns0.7-dbg.install
rename to debian/libopenturns0.8-dbg.install
diff --git a/debian/libopenturns0.8.install b/debian/libopenturns0.8.install
new file mode 100644
index 0000000..1b75f93
--- /dev/null
+++ b/debian/libopenturns0.8.install
@@ -0,0 +1,2 @@
+usr/lib/libOT.so.0*
+etc/openturns-1.*
diff --git a/debian/libopenturns0.8.lintian-overrides b/debian/libopenturns0.8.lintian-overrides
new file mode 100644
index 0000000..a52de99
--- /dev/null
+++ b/debian/libopenturns0.8.lintian-overrides
@@ -0,0 +1 @@
+libopenturns0.8 binary: package-name-doesnt-match-sonames libOT0.8
diff --git a/debian/openturns-examples.install b/debian/openturns-examples.install
index 5cf3184..0129d39 100644
--- a/debian/openturns-examples.install
+++ b/debian/openturns-examples.install
@@ -1,7 +1 @@
 usr/share/openturns/examples/*
-usr/lib/openturns-1.*/wrappers/external_code_threads*
-usr/lib/openturns-1.*/wrappers/minimal_wrapper*
-usr/lib/openturns-1.*/wrappers/poutre*
-usr/lib/openturns-1.*/wrappers/testwrapper*
-usr/lib/openturns-1.*/wrappers/Test*
-usr/lib/openturns-1.*/wrappers/wrapper.xml
diff --git a/debian/patches/tests-disable-coupling_tools.patch b/debian/patches/tests-disable-coupling_tools.patch
index 3bd50e4..194eabe 100644
--- a/debian/patches/tests-disable-coupling_tools.patch
+++ b/debian/patches/tests-disable-coupling_tools.patch
@@ -16,5 +16,5 @@ Index: openturns/python/test/CMakeLists.txt
 -  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/rules b/debian/rules
index 0b56d78..2c10954 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,12 +66,12 @@ cmake-configure-%:
             -DCMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(ldflags)' \
             -DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(ldflags)' \
             -DCMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(ldflags)' \
+            -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
             -DCMAKE_INSTALL_PREFIX:PATH=/usr \
             -DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
-            -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 \
+            -DLIB_SOVERSION=0.8 \
+            -DLIB_VERSION=0.8.0 \
+            -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.7 \
             -DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/tmp \
             -DLINK_PYTHON_LIBRARY:BOOL=OFF \
             -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python$* \
@@ -90,12 +90,10 @@ 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.7-dbg/usr/lib/debug/usr/lib
+	mkdir -p debian/libopenturns0.8-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.
-	[ -z "$$LD_LIBRARY_PATH" ] || sed -i -e "s#;LD_LIBRARY_PATH=[^;]*#&:$$LD_LIBRARY_PATH#" build-python$*/python/test/CTestTestfile.cmake
-	CTEST_OUTPUT_ON_FAILURE=1 \
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$${LD_LIBRARY_PATH}:}$(CURDIR)/debian/tmp/usr/lib \
+	  CTEST_OUTPUT_ON_FAILURE=1 \
 	  R_LIBS_SITE=$(CURDIR)/debian/tmp/usr/lib/R/site-library \
 	  $(MAKE) $(test_makeflags) -C build-python$* test ARGS="$(test_makeflags) -R pyinstallcheck"
 endif
@@ -104,7 +102,7 @@ override_dh_makeshlibs:
 	dh_makeshlibs -Xpyshared
 
 override_dh_strip:
-	dh_strip -plibopenturns0.7 --dbg-package=libopenturns0.7-dbg
+	dh_strip -plibopenturns0.8 --dbg-package=libopenturns0.8-dbg
 	dh_strip
 
 override_dh_python2:
@@ -114,7 +112,7 @@ override_dh_python3:
 	dh_python3 -p python3-openturns
 
 override_dh_compress:
-	dh_compress -X.pdf -X.svn -X.py
+	dh_compress -X.pdf -X.git -X.py
 
 override_dh_auto_test: $(PYALL:python%=cmake-test-%)
 
@@ -122,7 +120,9 @@ cmake-test-%:
 	# 'make test' does not build binary tests
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) $(test_makeflags) -C build-python$* tests
-	CTEST_OUTPUT_ON_FAILURE=1 $(MAKE) -C build-python$* test ARGS="$(test_makeflags) -R cppcheck"
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$${LD_LIBRARY_PATH}:}$(CURDIR)/debian/tmp/usr/lib \
+	  CTEST_OUTPUT_ON_FAILURE=1 \
+	  $(MAKE) -C build-python$* test ARGS="$(test_makeflags) -R cppcheck"
 endif
 
 get-orig-source:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openturns.git

