[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, experimental, updated. debian/gmsh_2.7.0.dfsg-1_exp1-2-g1662134

Anton Gladky gladky.anton at gmail.com
Fri Mar 15 21:55:12 UTC 2013


The following commit has been merged in the experimental branch:
commit 1662134ede3f7a14a9a51c8009e2df0c2049e0ac
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Mar 15 20:49:43 2013 +0100

    Install libs into ${INSTALL_LIB_DIR} patch, needed for multiarch.

diff --git a/debian/patches/fix_libdir.patch b/debian/patches/fix_libdir.patch
new file mode 100644
index 0000000..437ca32
--- /dev/null
+++ b/debian/patches/fix_libdir.patch
@@ -0,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})

-- 
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. 



More information about the debian-science-commits mailing list