r47068 - /packages/gmsh-tetgen/trunk/debian/patches/

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Mon Jul 6 15:55:40 UTC 2015 

Author: trophime-guest
Date: Mon Jul  6 15:55:39 2015
New Revision: 47068

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47068
Log:
update patches for rev >= 21703

Modified:
    packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
    packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
    packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
    packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch
    packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
    packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
    packages/gmsh-tetgen/trunk/debian/patches/med.patch
    packages/gmsh-tetgen/trunk/debian/patches/netgen.patch
    packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
    packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch

Modified: packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch?rev=47068&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch	Mon Jul  6 15:55:39 2015
@@ -7,27 +7,27 @@
 ===================================================================
 --- gmsh-tetgen-2.8.6~svn19843.orig/CMakeLists.txt
 +++ gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
-@@ -110,6 +110,7 @@
-     Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h 
+@@ -109,6 +109,7 @@
+     Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h
      Common/OS.h Common/StringUtils.h Common/OpenFile.h
      Common/onelab.h Common/GmshSocket.h Common/onelabUtils.h
 +    Common/Options.h
    Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
      Numeric/JacobianBasis.h Numeric/MetricBasis.h Numeric/bezierBasis.h Numeric/fullMatrix.h
      Numeric/FuncSpaceData.h
-@@ -132,6 +133,7 @@
-     Mesh/meshGFaceElliptic.h Mesh/meshPartition.h Mesh/meshGFaceDelaunayInsertion.h 
+@@ -131,6 +132,7 @@
+     Mesh/meshGFaceElliptic.h Mesh/meshPartition.h Mesh/meshGFaceDelaunayInsertion.h
      Mesh/simple3D.h Mesh/meshPartitionOptions.h Mesh/directions3D.h Mesh/yamakawa.h
      Mesh/Voronoi3D.h Mesh/Levy3D.h Mesh/periodical.h Mesh/meshMetric.h
 +    Mesh/Field.h
    Numeric/mathEvaluator.h
    Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
      Solver/crossConfTerm.h Solver/orthogonalTerm.h
-@@ -143,6 +145,7 @@
+@@ -142,6 +144,7 @@
    Post/PViewDataList.h Post/PViewDataGModel.h Post/PViewOptions.h Post/ColorTable.h
     Numeric/nodalBasis.h
    Graphics/drawContext.h
-+   Graphics/Camera.h Graphics/Trackball.h
-   contrib/kbipack/gmp_normal_form.h contrib/kbipack/gmp_matrix.h 
++  Graphics/Camera.h Graphics/Trackball.h
+   contrib/kbipack/gmp_normal_form.h contrib/kbipack/gmp_matrix.h
      contrib/kbipack/gmp_blas.h contrib/kbipack/mpz.h
    contrib/DiscreteIntegration/Integration3D.h

Modified: packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch?rev=47068&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch	Mon Jul  6 15:55:39 2015
@@ -2,16 +2,16 @@
 Author: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-11-28
 
-Index: gmsh-tetgen-2.8.6~svn19843/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.9.4~svn21703/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.6~svn19843.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-tetgen-2.8.6~svn19843/wrappers/java/CMakeLists.txt
+--- gmsh-tetgen-2.9.4~svn21703.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.9.4~svn21703/wrappers/java/CMakeLists.txt
 @@ -34,7 +34,11 @@ if(WIN32)
    set_target_properties(WrapGmsh PROPERTIES PREFIX "")
  endif(WIN32)
  if(UNIX)
 -  set_target_properties(WrapGmsh PROPERTIES PREFIX "lib")
-+  set_target_properties(WrapGmsh PROPERTIES 
++  set_target_properties(WrapGmsh PROPERTIES
 +    PREFIX "lib"
 +    OUTPUT_NAME java-gmsh
 +    SOVERSION "${GMSH_MAJOR_VERSION}"
@@ -19,30 +19,25 @@
  endif(UNIX)		
  add_custom_command(TARGET WrapGmsh 
  POST_BUILD # do the rest of the command after the build period
-Index: gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
+Index: gmsh-tetgen-2.9.4~svn21703/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.6~svn19843.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
-@@ -1376,7 +1376,7 @@ endforeach(DIR)
+--- gmsh-tetgen-2.9.4~svn21703.orig/CMakeLists.txt
++++ gmsh-tetgen-2.9.4~svn21703/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)
-@@ -1403,10 +1403,10 @@ endif(ENABLE_BUILD_ANDROID)
- if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR 
+@@ -1413,7 +1413,7 @@ 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 
--    VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
--    SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
-+                        VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
-+                        SOVERSION ${GMSH_MAJOR_VERSION})
-   if(HAVE_LAPACK AND LAPACK_FLAGS)
-     set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
-   endif(HAVE_LAPACK AND LAPACK_FLAGS)
+   set_target_properties(shared PROPERTIES
+     VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
+     SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})

Modified: packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch?rev=47068&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch	Mon Jul  6 15:55:39 2015
@@ -2,10 +2,10 @@
 Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
 Last-Update: 2011-12-09
 
-Index: gmsh-tetgen-2.8.6~svn19843/Graphics/CMakeLists.txt
+Index: gmsh-tetgen-2.9.4~svn21703/Graphics/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.6~svn19843.orig/Graphics/CMakeLists.txt
-+++ gmsh-tetgen-2.8.6~svn19843/Graphics/CMakeLists.txt
+--- gmsh-tetgen-2.9.4~svn21703.orig/Graphics/CMakeLists.txt
++++ gmsh-tetgen-2.9.4~svn21703/Graphics/CMakeLists.txt
 @@ -15,7 +15,6 @@ set(SRC
    drawScales.cpp 
    drawGraph2d.cpp 
@@ -14,11 +14,11 @@
    gl2gif.cpp
    gl2jpeg.cpp
    gl2png.cpp
-Index: gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
+Index: gmsh-tetgen-2.9.4~svn21703/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.6~svn19843.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
-@@ -1437,7 +1437,7 @@ else(HAVE_FLTK)
+--- gmsh-tetgen-2.9.4~svn21703.orig/CMakeLists.txt
++++ gmsh-tetgen-2.9.4~svn21703/CMakeLists.txt
+@@ -1447,7 +1447,7 @@ else(HAVE_FLTK)
      add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
    endif(ENABLE_BUILD_DYNAMIC)
  endif(HAVE_FLTK)

Modified: packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch?rev=47068&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch	Mon Jul  6 15:55:39 2015
@@ -2,11 +2,11 @@
 Author: Gilles Filippini <pini at debian.org>
 Last-Update: 2014-07-25
 
-Index: gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
+Index: gmsh-tetgen-2.9.4~svn21703/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.6~svn19843.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
-@@ -867,8 +867,10 @@ if(ENABLE_FOURIER_MODEL)
+--- gmsh-tetgen-2.9.4~svn21703.orig/CMakeLists.txt
++++ gmsh-tetgen-2.9.4~svn21703/CMakeLists.txt
+@@ -865,8 +865,10 @@ if(ENABLE_FOURIER_MODEL)
  endif(ENABLE_FOURIER_MODEL)
  
  if(ENABLE_MED OR ENABLE_CGNS)
@@ -19,7 +19,7 @@
      if(ENABLE_MED)
        find_library(MED_LIB med)
        if(MED_LIB)
-@@ -903,9 +905,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
+@@ -901,9 +903,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
          endif(ZLIB_FOUND)
        endif(NOT HAVE_LIBZ)
      endif(MED_LIB OR CGNS_LIB)

Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch?rev=47068&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch	Mon Jul  6 15:55:39 2015
@@ -6,12 +6,11 @@
 ===================================================================
 --- gmsh-tetgen-2.8.6~svn19843.orig/CMakeLists.txt
 +++ gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
-@@ -1414,7 +1414,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1424,7 +1424,7 @@
      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)		  
+   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 
+ endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
        ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
- 

Modified: 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=47068&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch	Mon Jul  6 15:55:39 2015
@@ -2,10 +2,10 @@
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2013-03-15
 
-Index: gmsh-tetgen-2.8.6~svn19843/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.9.4~svn21703/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.6~svn19843.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-tetgen-2.8.6~svn19843/wrappers/java/CMakeLists.txt
+--- gmsh-tetgen-2.9.4~svn21703.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.9.4~svn21703/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 @@
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar 
 -        DESTINATION lib)
 +  DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
+Index: gmsh-tetgen-2.9.4~svn21703/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.6~svn19843.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
-@@ -1558,7 +1558,7 @@ endif(WIN32 OR CYGWIN)
+--- gmsh-tetgen-2.9.4~svn21703.orig/CMakeLists.txt
++++ gmsh-tetgen-2.9.4~svn21703/CMakeLists.txt
+@@ -1568,7 +1568,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 @@
  endif(ENABLE_BUILD_LIB)
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
    if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1594,7 +1594,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1604,7 +1604,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)

Modified: packages/gmsh-tetgen/trunk/debian/patches/med.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/med.patch?rev=47068&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/med.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/med.patch	Mon Jul  6 15:55:39 2015
@@ -2,22 +2,22 @@
 ===================================================================
 --- gmsh-tetgen-2.8.6~svn19843.orig/CMakeLists.txt
 +++ gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
-@@ -875,6 +875,10 @@ if(ENABLE_MED OR ENABLE_CGNS)
-         set_config_option(HAVE_MED "Med")
+@@ -874,6 +874,10 @@
          list(APPEND EXTERNAL_LIBRARIES ${MED_LIB})
        endif(MED_LIB)
+     endif(ENABLE_MED)
 +      find_library(MEDC_LIB medC)
 +      if(MEDC_LIB)
 +        list(APPEND EXTERNAL_LIBRARIES ${MEDC_LIB})
 +      endif(MEDC_LIB)
-     endif(ENABLE_MED)    
      if(ENABLE_CGNS)
        find_library(CGNS_LIB cgns PATHS ENV CGNS_ROOT PATH_SUFFIXES lib)
-@@ -1820,7 +1824,7 @@ message(STATUS "")
- mark_as_advanced(GMSH_EXTRA_VERSION 
-                  ACIS_LIB ANN_INC ANN_LIB CAIRO_LIB CAIRO_INC CGNS_INC GMM_INC 
-                  GMP_INC GMP_LIB MMG3D_INC MMG3D_LIB TAUCS_INC TAUCS_LIB HDF5_LIB 
--                 MED_LIB OCC_INC OCC_CONFIG_H SZ_LIB 
+       find_path(CGNS_INC "cgnslib.h" PATHS ENV CGNS_ROOT PATH_SUFFIXES include)
+@@ -1833,7 +1837,7 @@
+ mark_as_advanced(GMSH_EXTRA_VERSION
+                  ACIS_LIB ANN_INC ANN_LIB CAIRO_LIB CAIRO_INC CGNS_INC GMM_INC
+                  GMP_INC GMP_LIB MMG3D_INC MMG3D_LIB TAUCS_INC TAUCS_LIB HDF5_LIB
+-                 MED_LIB OCC_INC OCC_CONFIG_H SZ_LIB
 +                 MED_LIB MEDC_LIB OCC_INC OCC_CONFIG_H SZ_LIB
                   PETSC_LIBS SLEPC_INC SLEPC_INC2 SLEPC_LIB
                   BISON FLEX MAKEINFO TEXI2PDF FLTK_CONFIG_SCRIPT

Modified: packages/gmsh-tetgen/trunk/debian/patches/netgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/netgen.patch?rev=47068&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/netgen.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/netgen.patch	Mon Jul  6 15:55:39 2015
@@ -2,7 +2,7 @@
 ===================================================================
 --- gmsh-tetgen-2.8.6~svn19843.orig/CMakeLists.txt
 +++ gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
-@@ -778,10 +778,36 @@ if(HAVE_MESH)
+@@ -777,9 +777,34 @@
    endif(ENABLE_BLOSSOM)
  
    if(ENABLE_NETGEN)
@@ -21,7 +21,7 @@
 +    endif(NGLIB_LIB AND NGLIB_INC)
 +
      add_subdirectory(contrib/Netgen)
--    include_directories(contrib/Netgen contrib/Netgen/libsrc/include 
+-    include_directories(contrib/Netgen contrib/Netgen/libsrc/include
 -                        contrib/Netgen/nglib)
 +    if(NGLIB_LIB AND NGLIB_INC)
 +       # to get contrib/Netgen/nglib_gmsh.cpp to compile
@@ -37,11 +37,9 @@
 +    endif(NGLIB_LIB AND NGLIB_INC)
 +
      set_config_option(HAVE_NETGEN "Netgen")
-+    # is this really required if nglib is found???
      add_definitions(-DNO_PARALLEL_THREADS -DNOTCL)
    endif(ENABLE_NETGEN)
- 
-@@ -1131,8 +1157,13 @@ if(ENABLE_OCC)
+@@ -1141,8 +1166,13 @@
        add_definitions(-DSGEOMGEOMETRY)
        set_config_option(HAVE_SGEOM "SGEOM")
      elseif(ENABLE_SALOME)

Modified: packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch?rev=47068&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch	Mon Jul  6 15:55:39 2015
@@ -6,7 +6,7 @@
 ===================================================================
 --- gmsh-tetgen-2.8.6~svn19843.orig/CMakeLists.txt
 +++ gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
-@@ -1488,7 +1488,7 @@ if(UNIX)
+@@ -1498,7 +1498,7 @@
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,12 +15,12 @@
  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/?*.*)
-@@ -1653,7 +1653,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+@@ -1663,7 +1663,7 @@
  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}

Modified: packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch?rev=47068&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch	Mon Jul  6 15:55:39 2015
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
+Index: gmsh-tetgen-2.9.4~svn21703/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.6~svn19843.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.6~svn19843/CMakeLists.txt
-@@ -831,29 +831,30 @@ if(HAVE_MESH)
+--- gmsh-tetgen-2.9.4~svn21703.orig/CMakeLists.txt
++++ gmsh-tetgen-2.9.4~svn21703/CMakeLists.txt
+@@ -829,29 +829,30 @@ if(HAVE_MESH)
      set_config_option(HAVE_MMG3D "Mmg3d")
    endif(ENABLE_MMG3D)

More information about the debian-science-commits mailing list