r45660 - in /packages/gmsh-tetgen/trunk/debian: changelog patches/fix_gmshpy_import.patch patches/fix_libdir.patch patches/series

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon Mar 25 07:57:19 2013
New Revision: 45660

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45660
Log:
load patches from Anton

Added:
    packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch
    packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
Modified:
    packages/gmsh-tetgen/trunk/debian/changelog
    packages/gmsh-tetgen/trunk/debian/patches/series

Modified: packages/gmsh-tetgen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/changelog?rev=45660&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/changelog (original)
+++ packages/gmsh-tetgen/trunk/debian/changelog Mon Mar 25 07:57:19 2013
@@ -1,3 +1,9 @@
+gmsh-tetgen (2.7.1~svn15090-1) unstable; urgency=low
+
+  * Update to 2.7.1 rev
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Mon, 25 Mar 2013 08:43:13 +0100
+
 gmsh-tetgen (2.6.2~svn14476-2) unstable; urgency=low
 
   [Anton Gladky]
@@ -6,6 +12,9 @@
 
   * add support for java wrappers
   * add a bibentry in debian/upstream 
+
+  * Fix import of gmshpy.
+  * Install libs into ${INSTALL_LIB_DIR} patch, needed for multiarch.
 
   [Christophe Trophime]
   * Rename java packages following libjava-gmsh2

Added: packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch?rev=45660&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch Mon Mar 25 07:57:19 2013
@@ -1,0 +1,15 @@
+Description: Fix import of gmshpy
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: http://bugs.debian.org/696420
+Last-Update: 2013-01-26
+
+--- a/wrappers/gmshpy/__init__.py.in
++++ b/wrappers/gmshpy/__init__.py.in
+@@ -1,4 +1,7 @@
+ # set Ctrl-C to default signal (terminates immediately)
++from ctypes import *
++mpi = CDLL('libmpi.so.0', RTLD_GLOBAL)
++
+ import signal
+ signal.signal(signal.SIGINT, signal.SIG_DFL)
+ ${GMSH_PYTHON_MODULES_INCLUDE_CODE}

Added: packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch?rev=45660&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch Mon Mar 25 07:57:19 2013
@@ -1,0 +1,30 @@
+Description: install libs into ${INSTALL_LIB_DIR}, needed for multiarch
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-03-15
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1208,10 +1208,10 @@
+ # (e.g. "make lib" or "make shared" followed by "make install/fast")
+ install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
+ if(ENABLE_BUILD_LIB)
+-  install(TARGETS lib DESTINATION lib OPTIONAL)
++  install(TARGETS lib DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
+ endif(ENABLE_BUILD_LIB)
+ if(ENABLE_BUILD_SHARED)
+-  install(TARGETS shared DESTINATION lib OPTIONAL)
++  install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
+ endif(ENABLE_BUILD_SHARED)
+ install(FILES ${GMSH_API} DESTINATION include/gmsh)
+ install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt)
+--- a/wrappers/java/CMakeLists.txt
++++ b/wrappers/java/CMakeLists.txt
+@@ -73,6 +73,6 @@
+   COMMAND ${CMAKE_COMMAND} -E copy 
+     ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml 
+     ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/)
+-install(TARGETS WrapGmsh DESTINATION lib OPTIONAL)
++install(TARGETS WrapGmsh DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar 
+-        DESTINATION lib)
++  DESTINATION ${INSTALL_LIB_DIR})

Modified: packages/gmsh-tetgen/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/series?rev=45660&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/series (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/series Mon Mar 25 07:57:19 2013
@@ -6,8 +6,8 @@
 api_demos.patch
 fix_FTBFS_linking.patch
 cgns.patch
-#pedantic.patch
 metis.patch
 alauzet.patch
 add-missing-headers.patch
-###onelab-version.patch
+fix_gmshpy_import.patch
+fix_libdir.patch