[SCM] Debian packaging for openturns www.openturns.org branch, debian1.2, updated. debian/1.2-1

Wed Jul 31 16:56:40 UTC 2013

The following commit has been merged in the debian1.2 branch:
commit 48f883925bb819b331cb20afb63268ed51f95e0f
Merge: 9602345a4c053f9416a0d34c3bc1ecbbdc05cefa c7675a67abea3b6c3478ab18c7d6ebdea7e4efc6
Author: Denis Barbier <bouzim at gmail.com>
Date:   Thu Jul 25 15:48:55 2013 +0200

    Merge branch 'debian' into debian1.2

diff --combined debian/changelog
index cd4745e,e4853fc..31b21e7

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,18 +1,41 @@@
 +openturns (1.2~rc1-2) experimental; urgency=low
 +
 +  [ Denis Barbier ]
 +  * debian/rules: Fix FTBFS on *-i386, copied from 1.1-8.
 +
 +  [ Julien Schueller ]
 +  * debian/patches/fix-bigendian.patch: Patch rewritten to use
 +    CMake detection of endianness.
 +
 + -- Denis Barbier <barbier at debian.org>  Mon, 15 Jul 2013 20:47:24 +0200
 +
 +openturns (1.2~rc1-1) experimental; 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-9) unstable; urgency=low
+ 
+   [ Julien Schueller ]
+   * debian/control: All libraries listed in OPENTURNS_LIBRARIES
+     variable into OpenTURNSConfig.cmake must be installed in order
+     to link against OT.  Let libopenturns-dev depend on
+      libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64]
+ 
+   [ Denis Barbier ]
+   * debian/control: Replace Architecture: any by an hardcoded list
+     of supported architectures.  Openturns requires more than 1GB RAM,
+     this caused a lot of trouble on mips* architectures.
+ 
+  -- Denis Barbier <barbier at debian.org>  Thu, 18 Jul 2013 19:10:04 +0200
+ 
  openturns (1.1-8) unstable; urgency=low
  
    * debian/rules: Fix building source package on *-i386, there was
diff --combined debian/control
index 533125d,d519acb..eaef436
--- a/debian/control
+++ b/debian/control
@@@ -10,7 -10,7 +10,7 @@@ Vcs-Browser: http://anonscm.debian.org/
  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,8 +45,8 @@@ Description: dynamic libraries for Open
  Package: libopenturns-dev
  Section: libdevel
  Architecture: any
- Depends: ${misc:Depends}, libopenturns0.3 (= ${binary:Version})
 -Depends: ${misc:Depends}, libopenturns0.2 (= ${binary:Version}),
++Depends: ${misc:Depends}, libopenturns0.3 (= ${binary:Version}),
+   libxml2-dev, liblapack-dev, libblas-dev, libtbb-dev [i386 amd64 ia64]
  Replaces: openturns-wrapper
  Breaks: openturns-wrapper
  Description: headers and development libraries for OpenTURNS
@@@ -87,7 -88,7 +88,7 @@@ Description: debug symbols for OpenTURN
  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 --combined debian/rules
index 42ccea0,ad23de3..6ed8da6
--- a/debian/rules
+++ b/debian/rules
@@@ -44,6 -44,9 +44,9 @@@ export R_LIBS=$(debRlib
  PYVER = $(shell pyversions -dv)
  
  %:
+ ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel))
+ 	$(error This package requires more than 1GB RAM; do not build on mips/mipsel)
+ endif
  	dh $@ --buildsystem=cmake --builddirectory=$(builddir) --with python2 --with quilt --parallel
  
  debian/tmp/usr/lib/R/site-library/rot:
@@@ -75,41 -78,35 +78,34 @@@ override_dh_auto_configure: debian/tmp/
              -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//') \
              -DPYTHON_LIBRARY:PATH=$$(python$(PYVER)-config --ldflags | sed -e 's/ .*//' -e 's/^-L//')/libpython$(PYVER).so
  
- ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel))
- override_dh_auto_build:
- 	$(MAKE) $(test_makeflags) -C $(builddir)/lib
- 	$(MAKE) -j1 -C $(builddir)/python
- 	$(MAKE) $(test_makeflags) -C $(builddir)
- 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:
@@@ -119,10 -116,9 +115,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

