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

Mon Jul 15 22:13:26 UTC 2013

The following commit has been merged in the debian1.2 branch:
commit 889aaf418daca4ce9360ac69ef172288290d2995
Merge: 56ff77d5dec1f0605f35b2efe5a97c71ba8f2d76 16d9a378d1e7907ec7775ee3950cd0f6df31f49e
Author: Denis Barbier <bouzim at gmail.com>
Date:   Mon Jul 15 20:46:38 2013 +0200

    Merge branch 'debian' into debian1.2

diff --combined debian/changelog
index 4caba8f,e3930c3..5ee5467

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,37 +1,49 @@@
 +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-8) unstable; urgency=low
+ 
+   * debian/rules: Fix building source package on *-i386, there was
+     trouble with debian/patches/modify-tests-O0-i386.patch.
+ 
+  -- Denis Barbier <barbier at debian.org>  Fri, 05 Jul 2013 18:06:37 +0200
+ 
+ openturns (1.1-7) unstable; urgency=low
+ 
+   * debian/patches/modify-tests-O0-i386.patch: On *-i386 architectures,
+     algocobyla.c is compiled with -O0 flag since 1.1-6; output of
+     two tests is modified.  Closes: #714915
+ 
+  -- Denis Barbier <barbier at debian.org>  Thu, 04 Jul 2013 22:36:45 +0200
+ 
+ openturns (1.1-6) unstable; urgency=low
+ 
+   * debian/rules: The previous change fixed C++ tests on kfreebsd-i386,
+     but pyinstallcheck_Cobyla_nonlinear hangs.  There is another hang
+     on i386.  The -fno-guess-branch-probability flag fixes the failure
+     on kfreebsd-i386, but compile instead algocobyla.c with -O0 flag
+     on *-i386 architectures to be safe.  Closes: #714411
+ 
+  -- Denis Barbier <barbier at debian.org>  Tue, 02 Jul 2013 20:08:27 +0200
+ 
+ openturns (1.1-5) unstable; urgency=low
+ 
+   * debian/rules: algocobyla.c is again miscompiled with gcc 4.8.1
+     on kfreebsd-i386 and hurd-i386, cppcheck_TrapezoidalFactory_std
+     and cppcheck_WhittleFactory_std hang; compile with -fno-caller-saves
+     to avoid these problems.  Closes: #714411
+ 
+  -- Denis Barbier <barbier at debian.org>  Sat, 29 Jun 2013 23:50:27 +0200
+ 
  openturns (1.1-4) unstable; urgency=low
  
    * Upload into unstable
diff --combined debian/rules
index 8e4be82,1b4b61f..42ccea0
--- a/debian/rules
+++ b/debian/rules
@@@ -28,7 -28,7 +28,7 @@@ ifeq ($(shell dpkg --print-architecture
      fflags := $(subst -O2,-O1,$(fflags))
  endif
  ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 kfreebsd-i386 hurd-i386))
-     cflags += -fno-cse-follow-jumps
+     cflags += -O0
  endif
  ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64 ia64))
      with_tbb := -DUSE_TBB:BOOL=ON
@@@ -50,6 -50,18 +50,18 @@@ debian/tmp/usr/lib/R/site-library/rot
  	-mkdir -p $(debRlib)
  	R CMD INSTALL --library=$(debRlib) utils/rot_1.4.5.tar.gz
  
+ ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 kfreebsd-i386 hurd-i386))
+ override_dh_quilt_patch:
+ 	dh_quilt_patch
+ 	test -e debian/patches/modify-tests-O0-i386.applied || patch -p1 < debian/patches/modify-tests-O0-i386.patch
+ 	touch debian/patches/modify-tests-O0-i386.applied
+ 
+ override_dh_quilt_unpatch:
+ 	test ! -e debian/patches/modify-tests-O0-i386.applied || patch -R -p1 < debian/patches/modify-tests-O0-i386.patch
+ 	-rm -f debian/patches/modify-tests-O0-i386.applied
+ 	dh_quilt_unpatch
+ endif
+ 
  override_dh_auto_configure: debian/tmp/usr/lib/R/site-library/rot
  	dh_auto_configure -- \
              $(with_tbb) \
@@@ -63,13 -75,12 +75,13 @@@
              -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//') \
@@@ -84,20 -95,22 +96,20 @@@ endi
  
  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:
@@@ -107,10 -120,9 +119,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

