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

Denis Barbier bouzim at gmail.com
Wed Jul 31 16:56:40 UTC 2013


The following commit has been merged in the debian1.2 branch:
commit 86cfd7ef1b6872c0485f2e868eff15aa77b0d6aa
Author: Denis Barbier <bouzim at gmail.com>
Date:   Thu Jul 25 20:07:10 2013 +0200

    Sync to distro/debian and upload 1.2-1 into experimental
    
    Drop patches merged upstream:
      fix-bigendian.patch
      remove-soname-python-module.patches
    Rename debian/patches/tests-disable-distributed_python_wrapper.patch
    into debian/patches/tests-disable-coupling_tools.patch

diff --git a/debian/changelog b/debian/changelog
index 31b21e7..d47ac02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+openturns (1.2-1) experimental; urgency=low
+
+  [Julien Schueller]
+  * New upstream version 1.2
+  * Drop patches merged upstream:
+      fix-bigendian.patch
+      remove-soname-python-module.patches
+  * Rename debian/patches/tests-disable-distributed_python_wrapper.patch
+    into debian/patches/tests-disable-coupling_tools.patch
+
+ -- Denis Barbier <barbier at debian.org>  Thu, 25 Jul 2013 20:06:52 +0200
+
 openturns (1.2~rc1-2) experimental; urgency=low
 
   [ Denis Barbier ]
diff --git a/debian/patches/fix-bigendian.patch b/debian/patches/fix-bigendian.patch
deleted file mode 100644
index aa12c42..0000000
--- a/debian/patches/fix-bigendian.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Fix build on big endian machines.
- Many checks fail on some (but not all) big endian machines.
- It seems that not all systems define __BIG_ENDIAN__.
- Add some compile-time checks to determine endianness.
-
-Author: Julien Schueller
-Origin: Upstream
-Forwarded: no
-Last-Update: 2013-07-15
-
-Index: openturns/CMakeLists.txt
-===================================================================
---- openturns.orig/CMakeLists.txt
-+++ openturns/CMakeLists.txt
-@@ -91,6 +91,9 @@ if ( USE_R )
-   find_package ( R COMPONENTS base rot )
- endif ()
- 
-+include ( TestBigEndian )
-+test_big_endian ( __BIG_ENDIAN__ ) 
-+
- # Find system prerequisites
- include ( CheckIncludeFile )
- check_include_file ( arpa/inet.h   HAVE_ARPA_INET_H   )
-Index: openturns/lib/include/OTconfig.h.in
-===================================================================
---- openturns.orig/lib/include/OTconfig.h.in
-+++ openturns/lib/include/OTconfig.h.in
-@@ -223,3 +223,6 @@
- 
- /* Define to `unsigned int' if <sys/types.h> does not define. */
- #cmakedefine size_t
-+
-+/* Define to 1 if big endian system */
-+#cmakedefine __BIG_ENDIAN__
-Index: openturns/lib/src/Base/Stat/dsfmt.h
-===================================================================
---- openturns.orig/lib/src/Base/Stat/dsfmt.h
-+++ openturns/lib/src/Base/Stat/dsfmt.h
-@@ -28,6 +28,7 @@
- #include <stdint.h>
- #include "simd.h"
- #include "OTprivate.hxx"
-+#include "OTconfig.hxx"
- 
- namespace tutils
- {
diff --git a/debian/patches/remove-soname-python-module.patch b/debian/patches/remove-soname-python-module.patch
deleted file mode 100644
index 2afef25..0000000
--- a/debian/patches/remove-soname-python-module.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Drop SONAME from Python modules
- dpkg-shlibdeps spits out many similar warnings:
-  dpkg-shlibdeps: warning: debian/python-openturns/usr/lib/python2.7/dist-packages/openturns/_algo.so contains an unresolvable reference to symbol PyObject_IsTrue: it's probably a plugin
- It seems reasonable to drop SONAME from plugins.
-Author: Denis Barbier <bouzim at gmail.com
-Origin: Debian
-Forwarded: no
-Last-Update: 2013-02-04
-
-Index: openturns/python/src/CMakeLists.txt
-===================================================================
---- openturns.orig/python/src/CMakeLists.txt
-+++ openturns/python/src/CMakeLists.txt
-@@ -69,6 +69,7 @@ macro ( ot_add_python_module MODULENAME
-     swig_link_libraries ( ${MODULENAME} ${PYTHON_LIBRARIES} )
-   endif ()
-   
-+  set_target_properties ( ${SWIG_MODULE_${MODULENAME}_REAL_NAME} PROPERTIES NO_SONAME ON)
-   if ( MINGW )
-     set_target_properties ( ${SWIG_MODULE_${MODULENAME}_REAL_NAME} PROPERTIES
-                                                                    LINK_FLAGS "-shared -Wl,--enable-auto-import" )
diff --git a/debian/patches/series b/debian/patches/series
index 9a8a973..8a2a9c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-fix-bigendian.patch
-tests-disable-distributed_python_wrapper.patch
-remove-soname-python-module.patch
+tests-disable-coupling_tools.patch
diff --git a/debian/patches/tests-disable-distributed_python_wrapper.patch b/debian/patches/tests-disable-coupling_tools.patch
similarity index 92%
rename from debian/patches/tests-disable-distributed_python_wrapper.patch
rename to debian/patches/tests-disable-coupling_tools.patch
index 95d0be3..0dae6e3 100644
--- a/debian/patches/tests-disable-distributed_python_wrapper.patch
+++ b/debian/patches/tests-disable-coupling_tools.patch
@@ -1,4 +1,4 @@
-Description: Disable distributed python wrapper tests
+Description: Disable coupling_tools test
  Some tests mysteriously fail on several architectures.
 Author: Denis Barbier
 Origin: Debian
diff --git a/debian/rules b/debian/rules
index 6ed8da6..bd2de06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,7 @@ override_dh_auto_configure: debian/tmp/usr/lib/R/site-library/rot
             -DOPENTURNS_WRAPPER_PATH:PATH=lib/openturns-1.2/wrappers \
             -DSYSTEM_INSTALL:BOOL=ON \
             -DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/tmp \
-            -DLINK_PYTHON_LIBRARY=OFF \
+            -DLINK_PYTHON_LIBRARY:BOOL=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//') \

-- 
Debian packaging for openturns www.openturns.org



More information about the debian-science-commits mailing list