r45969 - in /packages/gmsh-tetgen/trunk/debian/patches: change_shared_library_name.patch delete_gl2ps_from_source.patch fix_libdir.patch fix_spelling_errors.patch skip_license_file.patch switch_from_opencascade_to_oce.patch

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Mon May 27 07:21:12 UTC 2013 

Author: trophime-guest
Date: Mon May 27 07:21:12 2013
New Revision: 45969

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

Modified:
    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_libdir.patch
    packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch
    packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
    packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch

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=45969&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 May 27 07:21:12 2013
@@ -2,10 +2,10 @@
 Author: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-11-28
 
-Index: gmsh-tetgen-2.7.1~svn15527/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.7.2~svn15653/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.7.1~svn15527.orig/wrappers/java/CMakeLists.txt	2013-05-13 13:06:19.000000000 +0200
-+++ gmsh-tetgen-2.7.1~svn15527/wrappers/java/CMakeLists.txt	2013-05-13 13:06:22.000000000 +0200
+--- gmsh-tetgen-2.7.2~svn15653.orig/wrappers/java/CMakeLists.txt	2013-05-27 08:07:01.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15653/wrappers/java/CMakeLists.txt	2013-05-27 09:19:19.000000000 +0200
 @@ -34,7 +34,11 @@
    set_target_properties(WrapGmsh PROPERTIES PREFIX "")
  endif(WIN32)
@@ -19,11 +19,11 @@
  endif(UNIX)		
  add_custom_command(TARGET WrapGmsh 
  POST_BUILD # do the rest of the command after the build period
-Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
+Index: gmsh-tetgen-2.7.2~svn15653/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt	2013-05-13 13:06:19.000000000 +0200
-+++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt	2013-05-13 13:06:22.000000000 +0200
-@@ -1111,7 +1111,7 @@
+--- gmsh-tetgen-2.7.2~svn15653.orig/CMakeLists.txt	2013-05-27 08:07:06.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15653/CMakeLists.txt	2013-05-27 09:19:19.000000000 +0200
+@@ -1120,7 +1120,7 @@
  # static library target
  if(ENABLE_BUILD_LIB)
    add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +32,7 @@
    if(MSVC)
      set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
      if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1124,10 +1124,10 @@
+@@ -1133,10 +1133,10 @@
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR 
     ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
    add_library(shared SHARED ${GMSH_SRC})

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=45969&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 May 27 07:21:12 2013
@@ -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.7.1~svn15527/Graphics/CMakeLists.txt
+Index: gmsh-tetgen-2.7.2~svn15653/Graphics/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.7.1~svn15527.orig/Graphics/CMakeLists.txt	2013-05-13 12:46:34.000000000 +0200
-+++ gmsh-tetgen-2.7.1~svn15527/Graphics/CMakeLists.txt	2013-05-13 13:06:41.000000000 +0200
+--- gmsh-tetgen-2.7.2~svn15653.orig/Graphics/CMakeLists.txt	2013-05-27 08:07:00.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15653/Graphics/CMakeLists.txt	2013-05-27 09:15:09.000000000 +0200
 @@ -15,7 +15,6 @@
    drawScales.cpp 
    drawGraph2d.cpp 
@@ -14,11 +14,11 @@
    gl2gif.cpp
    gl2jpeg.cpp
    gl2png.cpp
-Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
+Index: gmsh-tetgen-2.7.2~svn15653/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt	2013-05-13 13:06:29.000000000 +0200
-+++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt	2013-05-13 13:06:41.000000000 +0200
-@@ -1158,7 +1158,7 @@
+--- gmsh-tetgen-2.7.2~svn15653.orig/CMakeLists.txt	2013-05-27 08:07:15.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15653/CMakeLists.txt	2013-05-27 09:15:09.000000000 +0200
+@@ -1167,7 +1167,7 @@
      add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
    endif(ENABLE_BUILD_DYNAMIC)
  endif(HAVE_FLTK)

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=45969&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch Mon May 27 07:21:12 2013
@@ -19,7 +19,7 @@
 ===================================================================
 --- gmsh-tetgen-2.7.2~svn15595.orig/CMakeLists.txt	2013-05-19 18:44:17.000000000 +0200
 +++ gmsh-tetgen-2.7.2~svn15595/CMakeLists.txt	2013-05-19 18:46:28.000000000 +0200
-@@ -1303,10 +1303,10 @@
+@@ -1303,7 +1303,7 @@
  # (e.g. "make lib" or "make shared" followed by "make install/fast")
  install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
  if(ENABLE_BUILD_LIB)
@@ -27,8 +27,13 @@
 +  install(TARGETS lib DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
  endif(ENABLE_BUILD_LIB)
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
--  install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
-+  install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
-   if(WIN32 OR CYGWIN)
-     # copy missing dlls    
-   endif(WIN32 OR CYGWIN)
+   if(WIN32 AND NOT MSVC OR CYGWIN)
+@@ -1322,7 +1322,7 @@
+       install(FILES ${GCC_DLL} ${GFORTRAN_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
+     endif(GCC_DLL AND GFORTRAN_DLL AND STDC_DLL)
+   else(WIN32 AND NOT MSVC OR CYGWIN)
+-    install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
++    install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
+   endif(WIN32 AND NOT MSVC OR CYGWIN)
+ endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
+ 

Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch?rev=45969&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch Mon May 27 07:21:12 2013
@@ -45,16 +45,16 @@
 ===================================================================
 --- gmsh-tetgen-2.7.1~svn15527.orig/doc/texinfo/gmsh.texi	2013-05-13 12:46:40.000000000 +0200
 +++ gmsh-tetgen-2.7.1~svn15527/doc/texinfo/gmsh.texi	2013-05-13 13:06:35.000000000 +0200
-@@ -1093,7 +1093,7 @@
+@@ -1097,7 +1097,7 @@
  etc.). The eigth case permits to use the value of a @var{char-option} as
  a @var{char-expression}. The ninth case gets the value of an environment
  variable from the operating system. The last case in the definition
 -allows to ask the user for a value interactively. The various
 +allows one to ask the user for a value interactively. The various
- @w{@var{char-option}s} are listed in @ref{Options}.
+ @w{@var{char-option}s} are listed in @ref{Options}.  @code{StrReplace}'s
+ arguments are: input string, old substring, new substring.
  
- Character expressions are mostly used to specify non-numeric options and
-@@ -2628,7 +2628,7 @@
+@@ -2633,7 +2633,7 @@
  @item Extrude @{ Surface @{ @var{expression-list} @}; @var{layers} < Using Index[@var{expr}]; > < Using View[@var{expr}]; > @}
  Extrudes a boundary layer from the specified surfaces. If no view is
  specified, the boundary layer is created using gouraud-shaped (smoothed)

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=45969&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch Mon May 27 07:21:12 2013
@@ -2,11 +2,11 @@
 Author: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2011-12-09
 
-Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
+Index: gmsh-tetgen-2.7.2~svn15653/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt	2013-05-13 13:06:22.000000000 +0200
-+++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt	2013-05-13 13:06:29.000000000 +0200
-@@ -1207,7 +1207,7 @@
+--- gmsh-tetgen-2.7.2~svn15653.orig/CMakeLists.txt	2013-05-27 09:19:19.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15653/CMakeLists.txt	2013-05-27 09:19:28.000000000 +0200
+@@ -1216,7 +1216,7 @@
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,7 +15,7 @@
  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/?*.*)
-@@ -1332,7 +1332,7 @@
+@@ -1358,7 +1358,7 @@
  if(MAKEINFO AND TEXI2PDF)
    add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf 
                      ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz

Modified: packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch?rev=45969&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch Mon May 27 07:21:12 2013
@@ -4,11 +4,11 @@
 Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-02-10
 
-Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
+Index: gmsh-tetgen-2.7.2~svn15653/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt	2013-05-13 13:06:41.000000000 +0200
-+++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt	2013-05-13 13:06:47.000000000 +0200
-@@ -890,15 +890,6 @@
+--- gmsh-tetgen-2.7.2~svn15653.orig/CMakeLists.txt	2013-05-27 09:15:09.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15653/CMakeLists.txt	2013-05-27 09:15:19.000000000 +0200
+@@ -899,15 +899,6 @@
  endif(HAVE_SOLVER)
  
  if(ENABLE_OCC)
@@ -24,7 +24,7 @@
    set(OCC_LIBS_REQUIRED
        # subset of DataExchange
        TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -909,6 +900,30 @@
+@@ -918,6 +909,30 @@
        TKBRep TKGeomBase TKG3d TKG2d
        # FoundationClasses
        TKAdvTools TKMath TKernel)
@@ -55,7 +55,7 @@
    list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
    set(OCC_LIBS)
    foreach(OCC ${OCC_LIBS_REQUIRED})
-@@ -944,6 +959,7 @@
+@@ -953,6 +968,7 @@
        endif(NOT OCC_CONFIG_H)
      endif(OCC_INC)
    endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)

More information about the debian-science-commits mailing list