[gmsh] 04/07: Refresh patches.

Anton Gladky gladk at moszumanska.debian.org
Wed Aug 26 20:50:42 UTC 2015 

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository gmsh.

commit e94c6d2b8fcd950aa9cbcedb34498dfff9939968
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Aug 26 22:39:22 2015 +0200

    Refresh patches.
---
 debian/patches/100_enable_tetgen.patch             | 19 +++++--------------
 debian/patches/10_change_shared_library_name.patch | 22 +++++++++++-----------
 debian/patches/110_fix_cmake_hdf5.patch            | 10 +++++-----
 debian/patches/120_relax_python_vers.patch         |  8 ++++----
 debian/patches/20_skip_license_file.patch          | 14 +++++++-------
 debian/patches/30_delete_gl2ps_from_source.patch   | 14 +++++++-------
 .../40_switch_from_opencascade_to_oce.patch        | 12 ++++++------
 debian/patches/50_fix_FTBFS_linking.patch          | 17 -----------------
 debian/patches/60_fix_gmshpy_import.patch          |  6 +++---
 debian/patches/70_fix_libdir.patch                 | 16 ++++++++--------
 debian/patches/80_fix_script_header.patch          |  6 +++---
 .../patches/90_fix_java_wrapper_compilation.patch  |  6 +++---
 debian/patches/series                              |  1 -
 13 files changed, 62 insertions(+), 89 deletions(-)

diff --git a/debian/patches/100_enable_tetgen.patch b/debian/patches/100_enable_tetgen.patch
index 97d421c..544ba0d 100644
--- a/debian/patches/100_enable_tetgen.patch
+++ b/debian/patches/100_enable_tetgen.patch
@@ -2,11 +2,11 @@ Description: Enable TetGen
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2014-02-10
 
-Index: gmsh-source/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/CMakeLists.txt
 ===================================================================
---- gmsh-source.orig/CMakeLists.txt
-+++ gmsh-source/CMakeLists.txt
-@@ -814,6 +814,7 @@ if(HAVE_MESH)
+--- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/CMakeLists.txt
+@@ -818,6 +818,7 @@ if(HAVE_MESH)
        list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
        list(APPEND EXTERNAL_INCLUDES ${TETGEN_INC})
        set_config_option(HAVE_TETGEN "Tetgen")
@@ -14,16 +14,7 @@ Index: gmsh-source/CMakeLists.txt
      endif(TETGEN_LIB AND TETGEN_INC)
    endif(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
    if(HAVE_TETGEN)
-@@ -1437,7 +1438,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
-     message(STATUS "Note: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library "
-             "won't link. In MSVC change /MT to /MD in the shared project properties")
-   endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)		  
--  target_link_libraries(shared ${LINK_LIBRARIES} -shared -lgl2ps -lGL -lglut)
-+  target_link_libraries(shared ${LINK_LIBRARIES} -shared -lgl2ps -lGL -lglut -ltet)
- endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR 
-       ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
- 
-@@ -1460,7 +1461,7 @@ else(HAVE_FLTK)
+@@ -1463,7 +1464,7 @@ else(HAVE_FLTK)
      add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
    endif(ENABLE_BUILD_DYNAMIC)
  endif(HAVE_FLTK)
diff --git a/debian/patches/10_change_shared_library_name.patch b/debian/patches/10_change_shared_library_name.patch
index 148025e..4b4268c 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-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.10.1-source_repack.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
 @@ -34,7 +34,11 @@ if(WIN32)
    set_target_properties(WrapGmsh PROPERTIES PREFIX "")
  endif(WIN32)
@@ -19,26 +19,26 @@ Index: gmsh-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-source/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/CMakeLists.txt
 ===================================================================
---- gmsh-source.orig/CMakeLists.txt
-+++ gmsh-source/CMakeLists.txt
-@@ -1383,7 +1383,7 @@ endforeach(DIR)
+--- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/CMakeLists.txt
+@@ -1386,7 +1386,7 @@ endforeach(DIR)
  # static library target
  if(ENABLE_BUILD_LIB)
    add_library(lib STATIC ${GMSH_SRC})
 -  set_target_properties(lib PROPERTIES OUTPUT_NAME Gmsh)
 +  set_target_properties(lib PROPERTIES OUTPUT_NAME gmsh)
    if(MSVC)
-     set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
+     set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
      if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1410,10 +1410,10 @@ endif(ENABLE_BUILD_ANDROID)
- if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR 
+@@ -1413,10 +1413,10 @@ endif(ENABLE_BUILD_ANDROID)
+ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
     ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
    add_library(shared SHARED ${GMSH_SRC})
 -  set_target_properties(shared PROPERTIES OUTPUT_NAME Gmsh)
 +  set_target_properties(shared PROPERTIES OUTPUT_NAME gmsh)
-   set_target_properties(shared PROPERTIES 
+   set_target_properties(shared PROPERTIES
      VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
 -    SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
 +    SOVERSION ${GMSH_MAJOR_VERSION})
diff --git a/debian/patches/110_fix_cmake_hdf5.patch b/debian/patches/110_fix_cmake_hdf5.patch
index 41b7b38..3d8991f 100644
--- a/debian/patches/110_fix_cmake_hdf5.patch
+++ b/debian/patches/110_fix_cmake_hdf5.patch
@@ -1,9 +1,9 @@
 Description: _fix_cmake_hdf5
-Index: gmsh-source/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/CMakeLists.txt
 ===================================================================
---- gmsh-source.orig/CMakeLists.txt
-+++ gmsh-source/CMakeLists.txt
-@@ -833,8 +833,10 @@ if(ENABLE_FOURIER_MODEL)
+--- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/CMakeLists.txt
+@@ -837,8 +837,10 @@ if(ENABLE_FOURIER_MODEL)
  endif(ENABLE_FOURIER_MODEL)
  
  if(ENABLE_MED OR ENABLE_CGNS)
@@ -16,7 +16,7 @@ Index: gmsh-source/CMakeLists.txt
      if(ENABLE_MED)
        find_library(MED_LIB med)
        if(MED_LIB)
-@@ -865,9 +867,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
+@@ -869,9 +871,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
          endif(ZLIB_FOUND)
        endif(NOT HAVE_LIBZ)
      endif(MED_LIB OR CGNS_LIB)
diff --git a/debian/patches/120_relax_python_vers.patch b/debian/patches/120_relax_python_vers.patch
index 845ee82..ee7d97c 100644
--- a/debian/patches/120_relax_python_vers.patch
+++ b/debian/patches/120_relax_python_vers.patch
@@ -2,11 +2,11 @@ Description: relax check of python libraries
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-05-26
 
-Index: gmsh-2.9.3-source/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/CMakeLists.txt
 ===================================================================
---- gmsh-2.9.3-source.orig/CMakeLists.txt
-+++ gmsh-2.9.3-source/CMakeLists.txt
-@@ -1181,7 +1181,7 @@ endif(HAVE_ZLIB AND ENABLE_COMPRESSED_IO
+--- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/CMakeLists.txt
+@@ -1184,7 +1184,7 @@ endif(HAVE_ZLIB AND ENABLE_COMPRESSED_IO
  if(ENABLE_WRAP_PYTHON)
    find_package(SWIG)
    find_package(PythonLibs)
diff --git a/debian/patches/20_skip_license_file.patch b/debian/patches/20_skip_license_file.patch
index 75fc354..0e43d7d 100644
--- a/debian/patches/20_skip_license_file.patch
+++ b/debian/patches/20_skip_license_file.patch
@@ -2,11 +2,11 @@ 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-source/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/CMakeLists.txt
 ===================================================================
---- gmsh-source.orig/CMakeLists.txt
-+++ gmsh-source/CMakeLists.txt
-@@ -1495,7 +1495,7 @@ if(UNIX)
+--- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/CMakeLists.txt
+@@ -1498,7 +1498,7 @@ if(UNIX)
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,12 +15,12 @@ Index: gmsh-source/CMakeLists.txt
  set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
  set(ONELAB_PY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py)
  file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
-@@ -1660,7 +1660,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+@@ -1665,7 +1665,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
  if(MAKEINFO AND TEXI2PDF)
-   add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf 
+   add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf
                      ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
 -                    doc/CREDITS.txt doc/LICENSE.txt doc/VERSIONS.txt
 +                    doc/CREDITS.txt doc/VERSIONS.txt
-                     doc/gmsh.1 doc/texinfo/gmsh.html doc/texinfo/gmsh.info 
+                     doc/gmsh.1 doc/texinfo/gmsh.html doc/texinfo/gmsh.info
                      doc/texinfo/gmsh.pdf doc/texinfo/gmsh.txt
                      COMMAND ${CMAKE_COMMAND} -E remove ${TEX_OBJ}
diff --git a/debian/patches/30_delete_gl2ps_from_source.patch b/debian/patches/30_delete_gl2ps_from_source.patch
index 387aa8b..f855c8c 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.
 Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
 Last-Update: 2012-11-28
 
-Index: gmsh-source/Graphics/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/Graphics/CMakeLists.txt
 ===================================================================
---- gmsh-source.orig/Graphics/CMakeLists.txt
-+++ gmsh-source/Graphics/CMakeLists.txt
+--- gmsh-2.10.1-source_repack.orig/Graphics/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/Graphics/CMakeLists.txt
 @@ -15,7 +15,6 @@ set(SRC
    drawScales.cpp 
    drawGraph2d.cpp 
@@ -14,11 +14,11 @@ Index: gmsh-source/Graphics/CMakeLists.txt
    gl2gif.cpp
    gl2jpeg.cpp
    gl2png.cpp
-Index: gmsh-source/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/CMakeLists.txt
 ===================================================================
---- gmsh-source.orig/CMakeLists.txt
-+++ gmsh-source/CMakeLists.txt
-@@ -1444,7 +1444,7 @@ else(HAVE_FLTK)
+--- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/CMakeLists.txt
+@@ -1447,7 +1447,7 @@ else(HAVE_FLTK)
      add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
    endif(ENABLE_BUILD_DYNAMIC)
  endif(HAVE_FLTK)
diff --git a/debian/patches/40_switch_from_opencascade_to_oce.patch b/debian/patches/40_switch_from_opencascade_to_oce.patch
index adfe291..785a4d1 100644
--- a/debian/patches/40_switch_from_opencascade_to_oce.patch
+++ b/debian/patches/40_switch_from_opencascade_to_oce.patch
@@ -4,11 +4,11 @@ Author: D. Barbier <bouzim at gmail.com>
 Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-02-10
 
-Index: gmsh-source/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/CMakeLists.txt
 ===================================================================
---- gmsh-source.orig/CMakeLists.txt
-+++ gmsh-source/CMakeLists.txt
-@@ -1064,15 +1064,6 @@ if(HAVE_SOLVER)
+--- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/CMakeLists.txt
+@@ -1067,15 +1067,6 @@ if(HAVE_SOLVER)
  endif(HAVE_SOLVER)
  
  if(ENABLE_OCC)
@@ -24,7 +24,7 @@ Index: gmsh-source/CMakeLists.txt
    set(OCC_LIBS_REQUIRED
        # subset of DataExchange
        TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -1084,6 +1075,30 @@ if(ENABLE_OCC)
+@@ -1087,6 +1078,30 @@ if(ENABLE_OCC)
        # FoundationClasses
        # TKAdvTools -- not necessary? (and removed from OCC 6.8)
        TKMath TKernel)
@@ -55,7 +55,7 @@ Index: gmsh-source/CMakeLists.txt
    if(ENABLE_SGEOM)
      set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
        # For SGEOM
-@@ -1128,6 +1143,7 @@ if(ENABLE_OCC)
+@@ -1131,6 +1146,7 @@ if(ENABLE_OCC)
        endif(NOT OCC_CONFIG_H)
      endif(OCC_INC)
    endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
diff --git a/debian/patches/50_fix_FTBFS_linking.patch b/debian/patches/50_fix_FTBFS_linking.patch
deleted file mode 100644
index 01a6cbb..0000000
--- a/debian/patches/50_fix_FTBFS_linking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: this linking causes a FTBFS 
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-11-28
-
-Index: gmsh-source/CMakeLists.txt
-===================================================================
---- gmsh-source.orig/CMakeLists.txt
-+++ gmsh-source/CMakeLists.txt
-@@ -1437,7 +1437,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
-     message(STATUS "Note: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library "
-             "won't link. In MSVC change /MT to /MD in the shared project properties")
-   endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)		  
--  target_link_libraries(shared ${LINK_LIBRARIES})
-+  target_link_libraries(shared ${LINK_LIBRARIES} -shared -lgl2ps -lGL -lglut)
- endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR 
-       ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
- 
diff --git a/debian/patches/60_fix_gmshpy_import.patch b/debian/patches/60_fix_gmshpy_import.patch
index 4931c1b..15f789c 100644
--- a/debian/patches/60_fix_gmshpy_import.patch
+++ b/debian/patches/60_fix_gmshpy_import.patch
@@ -3,10 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
 Bug-Debian: http://bugs.debian.org/696420
 Last-Update: 2014-02-06
 
-Index: gmsh-source/wrappers/gmshpy/__init__.py.in
+Index: gmsh-2.10.1-source_repack/wrappers/gmshpy/__init__.py.in
 ===================================================================
---- gmsh-source.orig/wrappers/gmshpy/__init__.py.in
-+++ gmsh-source/wrappers/gmshpy/__init__.py.in
+--- gmsh-2.10.1-source_repack.orig/wrappers/gmshpy/__init__.py.in
++++ gmsh-2.10.1-source_repack/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 6762262..a1b57be 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-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.10.1-source_repack.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/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,11 +15,11 @@ Index: gmsh-source/wrappers/java/CMakeLists.txt
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar 
 -        DESTINATION lib)
 +  DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-source/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/CMakeLists.txt
 ===================================================================
---- gmsh-source.orig/CMakeLists.txt
-+++ gmsh-source/CMakeLists.txt
-@@ -1578,7 +1578,7 @@ endif(WIN32 OR CYGWIN)
+--- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/CMakeLists.txt
+@@ -1581,7 +1581,7 @@ endif(WIN32 OR CYGWIN)
  # (e.g. "make lib" or "make shared" followed by "make install/fast")
  install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
  if(ENABLE_BUILD_LIB)
@@ -28,7 +28,7 @@ Index: gmsh-source/CMakeLists.txt
  endif(ENABLE_BUILD_LIB)
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
    if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1614,7 +1614,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1617,7 +1617,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
        install(FILES ${GCC_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
      endif(GCC_DLL AND STDC_DLL)
    else(WIN32 AND NOT MSVC OR CYGWIN)
diff --git a/debian/patches/80_fix_script_header.patch b/debian/patches/80_fix_script_header.patch
index cbf7393..d33ab6a 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-source/contrib/onelab/python/onelab.py
+Index: gmsh-2.10.1-source_repack/contrib/onelab/python/onelab.py
 ===================================================================
---- gmsh-source.orig/contrib/onelab/python/onelab.py
-+++ gmsh-source/contrib/onelab/python/onelab.py
+--- gmsh-2.10.1-source_repack.orig/contrib/onelab/python/onelab.py
++++ gmsh-2.10.1-source_repack/contrib/onelab/python/onelab.py
 @@ -27,6 +27,8 @@ Please report all bugs and problems to t
  <gmsh at geuz.org>.
  """
diff --git a/debian/patches/90_fix_java_wrapper_compilation.patch b/debian/patches/90_fix_java_wrapper_compilation.patch
index b98606e..236c719 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-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.10.1-source_repack.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
 @@ -13,7 +13,7 @@ include_directories(${JAVA_INCLUDE_PATH}
  include_directories(${JAVA_INCLUDE_PATH2})
  include_directories(${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/debian/patches/series b/debian/patches/series
index fcbd1ae..92cad25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 20_skip_license_file.patch
 30_delete_gl2ps_from_source.patch
 40_switch_from_opencascade_to_oce.patch
-50_fix_FTBFS_linking.patch
 60_fix_gmshpy_import.patch
 70_fix_libdir.patch
 80_fix_script_header.patch

-- 
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