[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. debian/2.5.1_beta2_svn11604_dfsg-4-5-g247acb8

Anton Gladky gladky.anton at gmail.com
Mon Apr 9 15:01:28 UTC 2012


The following commit has been merged in the master branch:
commit 247acb8e326284a1222316cc8c6e77d0af8a5b00
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Apr 9 17:01:23 2012 +0200

    Refresh patches.

diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index cb47fdd..98d090b 100644
--- a/debian/patches/change_shared_library_name.patch
+++ b/debian/patches/change_shared_library_name.patch
@@ -4,7 +4,7 @@ Last-Update: 2011-12-09
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -999,7 +999,7 @@
+@@ -1006,7 +1006,7 @@
  # want to build the lib we need to recompile everything (the first
  # time--it's a separate target)
  add_library(lib STATIC EXCLUDE_FROM_ALL ${GMSH_SRC})
@@ -13,7 +13,7 @@ Last-Update: 2011-12-09
  if(MSVC)
    set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
    if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1009,7 +1009,7 @@
+@@ -1016,7 +1016,7 @@
  
  # shared library target: we don't build it by default either
  add_library(shared SHARED EXCLUDE_FROM_ALL ${GMSH_SRC})
diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index cec3ed0..2fedd7d 100644
--- a/debian/patches/delete_gl2ps_from_source.patch
+++ b/debian/patches/delete_gl2ps_from_source.patch
@@ -14,7 +14,7 @@ Last-Update: 2011-12-09
    gl2png.cpp
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1032,7 +1032,7 @@
+@@ -1039,7 +1039,7 @@
    add_executable(gmsh_dynamic EXCLUDE_FROM_ALL Common/Main.cpp)
    target_link_libraries(gmsh_dynamic shared)
  endif(HAVE_FLTK)
diff --git a/debian/patches/fix_spelling_errors.patch b/debian/patches/fix_spelling_errors.patch
index e67d821..9661b3a 100644
--- a/debian/patches/fix_spelling_errors.patch
+++ b/debian/patches/fix_spelling_errors.patch
@@ -48,7 +48,7 @@ Last-Update: 2011-12-09
  @w{@var{char-option}s} are listed in @ref{Options}.
  
  Character expressions are mostly used to specify non-numeric options and
-@@ -2921,7 +2921,7 @@
+@@ -2922,7 +2922,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)
diff --git a/debian/patches/skip_license_file.patch b/debian/patches/skip_license_file.patch
index 0028c25..6e86ee5 100644
--- a/debian/patches/skip_license_file.patch
+++ b/debian/patches/skip_license_file.patch
@@ -4,7 +4,7 @@ Last-Update: 2011-12-09
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1074,7 +1074,7 @@
+@@ -1087,7 +1087,7 @@
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -13,7 +13,7 @@ Last-Update: 2011-12-09
  set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
  file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
  file(GLOB DEMO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/demos/?*.*)
-@@ -1169,7 +1169,7 @@
+@@ -1182,7 +1182,7 @@
  if(MAKEINFO AND TEXI2PDF)
    add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf 
                      ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
diff --git a/debian/patches/switch_from_opencascade_to_oce.patch b/debian/patches/switch_from_opencascade_to_oce.patch
index 8f5c891..eddcabe 100644
--- a/debian/patches/switch_from_opencascade_to_oce.patch
+++ b/debian/patches/switch_from_opencascade_to_oce.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-02-10
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -797,15 +797,6 @@
+@@ -804,15 +804,6 @@
  endif(HAVE_SOLVER)
  
  if(ENABLE_OCC)
@@ -22,7 +22,7 @@ Last-Update: 2012-02-10
    set(OCC_LIBS_REQUIRED
        # subset of DataExchange
        TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -816,6 +807,30 @@
+@@ -823,6 +814,30 @@
        TKBRep TKGeomBase TKG3d TKG2d
        # FoundationClasses
        TKAdvTools TKMath TKernel)
@@ -53,7 +53,7 @@ Last-Update: 2012-02-10
    list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
    set(OCC_LIBS)
    foreach(OCC ${OCC_LIBS_REQUIRED})
-@@ -852,6 +867,7 @@
+@@ -859,6 +874,7 @@
        endif(NOT OCC_CONFIG_H)
      endif(OCC_INC)
    endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)

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



More information about the debian-science-commits mailing list