[gmsh] 01/03: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Sat Nov 5 06:24:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gmsh.
commit 4da51dc97b96a76925f6ebb7b70c3d40f5a74e64
Author: Anton Gladky <gladk at debian.org>
Date: Sat Nov 5 07:16:29 2016 +0100
Refresh patches.
---
debian/patches/10_change_shared_library_name.patch | 12 ++++++------
debian/patches/110_fix_cmake_hdf5.patch | 6 +++---
debian/patches/120_relax_python_vers.patch | 6 +++---
debian/patches/20_skip_license_file.patch | 6 +++---
debian/patches/30_delete_gl2ps_from_source.patch | 12 ++++++------
debian/patches/40_switch_from_opencascade_to_oce.patch | 6 +++---
debian/patches/60_fix_gmshpy_import.patch | 6 +++---
debian/patches/70_fix_libdir.patch | 12 ++++++------
debian/patches/80_fix_script_header.patch | 6 +++---
debian/patches/90_fix_java_wrapper_compilation.patch | 6 +++---
10 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/debian/patches/10_change_shared_library_name.patch b/debian/patches/10_change_shared_library_name.patch
index f6e55e9..697ee46 100644
--- a/debian/patches/10_change_shared_library_name.patch
+++ b/debian/patches/10_change_shared_library_name.patch
@@ -2,10 +2,10 @@ Description: Change name of shared library
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
-Index: gmsh-2.14.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.14.1-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.14.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.14.0-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.14.1-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.14.1-source/wrappers/java/CMakeLists.txt
@@ -34,7 +34,11 @@ if(WIN32)
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
@@ -19,10 +19,10 @@ Index: gmsh-2.14.0-source/wrappers/java/CMakeLists.txt
endif(UNIX)
add_custom_command(TARGET WrapGmsh
POST_BUILD # do the rest of the command after the build period
-Index: gmsh-2.14.0-source/CMakeLists.txt
+Index: gmsh-2.14.1-source/CMakeLists.txt
===================================================================
---- gmsh-2.14.0-source.orig/CMakeLists.txt
-+++ gmsh-2.14.0-source/CMakeLists.txt
+--- gmsh-2.14.1-source.orig/CMakeLists.txt
++++ gmsh-2.14.1-source/CMakeLists.txt
@@ -1453,7 +1453,7 @@ endforeach(DIR)
# static library target
if(ENABLE_BUILD_LIB)
diff --git a/debian/patches/110_fix_cmake_hdf5.patch b/debian/patches/110_fix_cmake_hdf5.patch
index d3318ea..10e8422 100644
--- a/debian/patches/110_fix_cmake_hdf5.patch
+++ b/debian/patches/110_fix_cmake_hdf5.patch
@@ -1,8 +1,8 @@
Description: _fix_cmake_hdf5
-Index: gmsh-2.14.0-source/CMakeLists.txt
+Index: gmsh-2.14.1-source/CMakeLists.txt
===================================================================
---- gmsh-2.14.0-source.orig/CMakeLists.txt
-+++ gmsh-2.14.0-source/CMakeLists.txt
+--- gmsh-2.14.1-source.orig/CMakeLists.txt
++++ gmsh-2.14.1-source/CMakeLists.txt
@@ -839,8 +839,10 @@ if(ENABLE_FOURIER_MODEL)
endif(ENABLE_FOURIER_MODEL)
diff --git a/debian/patches/120_relax_python_vers.patch b/debian/patches/120_relax_python_vers.patch
index 3c43a00..17ea7a1 100644
--- a/debian/patches/120_relax_python_vers.patch
+++ b/debian/patches/120_relax_python_vers.patch
@@ -2,10 +2,10 @@ Description: relax check of python libraries
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-05-26
-Index: gmsh-2.14.0-source/CMakeLists.txt
+Index: gmsh-2.14.1-source/CMakeLists.txt
===================================================================
---- gmsh-2.14.0-source.orig/CMakeLists.txt
-+++ gmsh-2.14.0-source/CMakeLists.txt
+--- gmsh-2.14.1-source.orig/CMakeLists.txt
++++ gmsh-2.14.1-source/CMakeLists.txt
@@ -1228,7 +1228,7 @@ endif(ENABLE_ZIPPER)
if(ENABLE_WRAP_PYTHON)
find_package(SWIG)
diff --git a/debian/patches/20_skip_license_file.patch b/debian/patches/20_skip_license_file.patch
index 6dda8fa..5622b98 100644
--- a/debian/patches/20_skip_license_file.patch
+++ b/debian/patches/20_skip_license_file.patch
@@ -2,10 +2,10 @@ Description: skips LICENSE.txt during installation. All information is in debian
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
-Index: gmsh-2.14.0-source/CMakeLists.txt
+Index: gmsh-2.14.1-source/CMakeLists.txt
===================================================================
---- gmsh-2.14.0-source.orig/CMakeLists.txt
-+++ gmsh-2.14.0-source/CMakeLists.txt
+--- gmsh-2.14.1-source.orig/CMakeLists.txt
++++ gmsh-2.14.1-source/CMakeLists.txt
@@ -1566,7 +1566,7 @@ if(UNIX)
endif(UNIX)
diff --git a/debian/patches/30_delete_gl2ps_from_source.patch b/debian/patches/30_delete_gl2ps_from_source.patch
index 08c9be5..0376388 100644
--- a/debian/patches/30_delete_gl2ps_from_source.patch
+++ b/debian/patches/30_delete_gl2ps_from_source.patch
@@ -2,10 +2,10 @@ Description: delete gl2ps and use packaged version. Use also packaged tetgen.
Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
Last-Update: 2012-11-28
-Index: gmsh-2.14.0-source/Graphics/CMakeLists.txt
+Index: gmsh-2.14.1-source/Graphics/CMakeLists.txt
===================================================================
---- gmsh-2.14.0-source.orig/Graphics/CMakeLists.txt
-+++ gmsh-2.14.0-source/Graphics/CMakeLists.txt
+--- gmsh-2.14.1-source.orig/Graphics/CMakeLists.txt
++++ gmsh-2.14.1-source/Graphics/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SRC
drawScales.cpp
drawGraph2d.cpp
@@ -14,10 +14,10 @@ Index: gmsh-2.14.0-source/Graphics/CMakeLists.txt
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-2.14.0-source/CMakeLists.txt
+Index: gmsh-2.14.1-source/CMakeLists.txt
===================================================================
---- gmsh-2.14.0-source.orig/CMakeLists.txt
-+++ gmsh-2.14.0-source/CMakeLists.txt
+--- gmsh-2.14.1-source.orig/CMakeLists.txt
++++ gmsh-2.14.1-source/CMakeLists.txt
@@ -819,6 +819,7 @@ if(HAVE_MESH)
if(TETGEN_LIB AND TETGEN_INC)
list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
diff --git a/debian/patches/40_switch_from_opencascade_to_oce.patch b/debian/patches/40_switch_from_opencascade_to_oce.patch
index 049b5f5..698f332 100644
--- a/debian/patches/40_switch_from_opencascade_to_oce.patch
+++ b/debian/patches/40_switch_from_opencascade_to_oce.patch
@@ -4,10 +4,10 @@ Author: D. Barbier <bouzim at gmail.com>
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-02-10
-Index: gmsh-2.14.0-source/CMakeLists.txt
+Index: gmsh-2.14.1-source/CMakeLists.txt
===================================================================
---- gmsh-2.14.0-source.orig/CMakeLists.txt
-+++ gmsh-2.14.0-source/CMakeLists.txt
+--- gmsh-2.14.1-source.orig/CMakeLists.txt
++++ gmsh-2.14.1-source/CMakeLists.txt
@@ -1093,15 +1093,6 @@ if(HAVE_SOLVER)
endif(HAVE_SOLVER)
diff --git a/debian/patches/60_fix_gmshpy_import.patch b/debian/patches/60_fix_gmshpy_import.patch
index 80a1bb3..370f1d7 100644
--- a/debian/patches/60_fix_gmshpy_import.patch
+++ b/debian/patches/60_fix_gmshpy_import.patch
@@ -2,10 +2,10 @@ Description: Fix import of gmshpy
Bug-Debian: https://bugs.debian.org/696420
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2014-02-06
-Index: gmsh-2.14.0-source/wrappers/gmshpy/__init__.py.in
+Index: gmsh-2.14.1-source/wrappers/gmshpy/__init__.py.in
===================================================================
---- gmsh-2.14.0-source.orig/wrappers/gmshpy/__init__.py.in
-+++ gmsh-2.14.0-source/wrappers/gmshpy/__init__.py.in
+--- gmsh-2.14.1-source.orig/wrappers/gmshpy/__init__.py.in
++++ gmsh-2.14.1-source/wrappers/gmshpy/__init__.py.in
@@ -1,4 +1,7 @@
# set Ctrl-C to default signal (terminates immediately)
+from ctypes import *
diff --git a/debian/patches/70_fix_libdir.patch b/debian/patches/70_fix_libdir.patch
index ff23588..929a045 100644
--- a/debian/patches/70_fix_libdir.patch
+++ b/debian/patches/70_fix_libdir.patch
@@ -2,10 +2,10 @@ Description: install libs into ${INSTALL_LIB_DIR}, needed for multiarch
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
-Index: gmsh-2.14.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.14.1-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.14.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.14.0-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.14.1-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.14.1-source/wrappers/java/CMakeLists.txt
@@ -73,6 +73,6 @@ POST_BUILD # do the rest of the command
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml
@@ -15,10 +15,10 @@ Index: gmsh-2.14.0-source/wrappers/java/CMakeLists.txt
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-2.14.0-source/CMakeLists.txt
+Index: gmsh-2.14.1-source/CMakeLists.txt
===================================================================
---- gmsh-2.14.0-source.orig/CMakeLists.txt
-+++ gmsh-2.14.0-source/CMakeLists.txt
+--- gmsh-2.14.1-source.orig/CMakeLists.txt
++++ gmsh-2.14.1-source/CMakeLists.txt
@@ -1652,7 +1652,7 @@ endif(WIN32 OR CYGWIN)
# (e.g. "make lib" or "make shared" followed by "make install/fast")
install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
diff --git a/debian/patches/80_fix_script_header.patch b/debian/patches/80_fix_script_header.patch
index ba374d1..314fa1c 100644
--- a/debian/patches/80_fix_script_header.patch
+++ b/debian/patches/80_fix_script_header.patch
@@ -2,10 +2,10 @@ Description: add header into onelab
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-05-12
-Index: gmsh-2.14.0-source/contrib/onelab/python/onelab.py
+Index: gmsh-2.14.1-source/contrib/onelab/python/onelab.py
===================================================================
---- gmsh-2.14.0-source.orig/contrib/onelab/python/onelab.py
-+++ gmsh-2.14.0-source/contrib/onelab/python/onelab.py
+--- gmsh-2.14.1-source.orig/contrib/onelab/python/onelab.py
++++ gmsh-2.14.1-source/contrib/onelab/python/onelab.py
@@ -27,6 +27,8 @@ Please report all bugs and problems to t
<gmsh at onelab.info>.
"""
diff --git a/debian/patches/90_fix_java_wrapper_compilation.patch b/debian/patches/90_fix_java_wrapper_compilation.patch
index ee3b192..8a6695b 100644
--- a/debian/patches/90_fix_java_wrapper_compilation.patch
+++ b/debian/patches/90_fix_java_wrapper_compilation.patch
@@ -2,10 +2,10 @@ Description: <short summary of the patch>
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-07-24
-Index: gmsh-2.14.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.14.1-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.14.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.14.0-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.14.1-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.14.1-source/wrappers/java/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(${JAVA_INCLUDE_PATH}
include_directories(${JAVA_INCLUDE_PATH2})
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git
More information about the debian-science-commits
mailing list