[openturns] 01/03: Copy debian/* files from upstream distro/debian/

[Denis Barbier]

This is an automated email from the git hooks/post-receive script.

barbier-guest pushed a commit to branch debian
in repository openturns.

commit 8755b7543cc54c9a507c38e227447a72a8e35f4a
Author: Denis Barbier <bouzim at gmail.com>
Date:   Tue Dec 17 21:33:23 2013 +0100

    Copy debian/* files from upstream distro/debian/
---
 debian/changelog                                           |  9 +++++++++
 debian/control                                             | 10 +++++-----
 .../{libopenturns0.3.install => libopenturns0.4.install}   |  0
 ...lintian-overrides => libopenturns0.4.lintian-overrides} |  0
 debian/rules                                               | 14 +++++++-------
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ee4279..3ae1954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openturns (1.3~rc1-1) experimental; urgency=low
+
+  [Julien Schueller]
+  * New upstream pre-release.
+  * Output test log on failure
+  * Bump soname to 0.4
+
+ -- Denis Barbier <barbier at debian.org>  Tue, 17 Dec 2013 15:06:52 +0100
+
 openturns (1.2-2) unstable; urgency=low
 
   * Upload into unstable
diff --git a/debian/control b/debian/control
index eaef436..21fa937 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Denis Barbier <barbier at debian.org>
-Build-Depends: debhelper (>= 8), quilt, gfortran, bison, flex, libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64], r-base-core, python-dev, swig, cmake, bc
+Build-Depends: debhelper (>= 8), quilt, gfortran, bison, flex, libmuparser-dev, libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64], r-base-core, python-dev, swig, cmake, bc
 Standards-Version: 3.9.4
 Homepage: http://www.openturns.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/openturns.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/openturns.git
 X-Python-Version: current
 
-Package: libopenturns0.3
+Package: libopenturns0.4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,8 +45,8 @@ Description: dynamic libraries for OpenTURNS
 Package: libopenturns-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libopenturns0.3 (= ${binary:Version}),
-  libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64]
+Depends: ${misc:Depends}, libopenturns0.4 (= ${binary:Version}),
+  libmuparser-dev, libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64]
 Replaces: openturns-wrapper
 Breaks: openturns-wrapper
 Description: headers and development libraries for OpenTURNS
@@ -88,7 +88,7 @@ Description: debug symbols for OpenTURNS
 Package: python-openturns
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.3 (= ${binary:Version}), ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenturns0.4 (= ${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.3.install b/debian/libopenturns0.4.install
similarity index 100%
rename from debian/libopenturns0.3.install
rename to debian/libopenturns0.4.install
diff --git a/debian/libopenturns0.3.lintian-overrides b/debian/libopenturns0.4.lintian-overrides
similarity index 100%
rename from debian/libopenturns0.3.lintian-overrides
rename to debian/libopenturns0.4.lintian-overrides
diff --git a/debian/rules b/debian/rules
index 23a1d1f..376da57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,10 +79,10 @@ 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.3 \
-            -DLIB_VERSION=0.3.0 \
-            -DOPENTURNS_SYSCONFIG_PATH:PATH=/etc/openturns-1.2 \
-            -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.2/wrappers \
+            -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 \
             -DSYSTEM_INSTALL:BOOL=ON \
             -DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/tmp \
             -DLINK_PYTHON_LIBRARY:BOOL=OFF \
@@ -99,14 +99,14 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	[ -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) test ARGS="$(test_makeflags) -R pyinstallcheck"
+	  $(MAKE) $(test_makeflags) -C $(builddir) test ARGS="$(test_makeflags) -R pyinstallcheck" || { cat $(builddir)/Testing/Temporary/LastTest.log; false; }
 endif
 
 override_dh_makeshlibs:
 	dh_makeshlibs -Xpyshared
 
 override_dh_strip:
-	dh_strip -plibopenturns0.3 --dbg-package=libopenturns-dbg
+	dh_strip -plibopenturns0.4 --dbg-package=libopenturns-dbg
 	dh_strip
 
 override_dh_python2:
@@ -119,7 +119,7 @@ override_dh_auto_test:
 	# 'make test' does not build binary tests
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) $(test_makeflags) -C $(builddir) tests
-	CTEST_OUTPUT_ON_FAILURE=1 $(MAKE) -C $(builddir) test ARGS="$(test_makeflags) -R cppcheck"
+	CTEST_OUTPUT_ON_FAILURE=1 $(MAKE) -C $(builddir) test ARGS="$(test_makeflags) -R cppcheck" || { cat $(builddir)/Testing/Temporary/LastTest.log; false; }
 endif
 
 get-orig-source:

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