[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. upstream/2.5.1_beta2_svn11301_dfsg-131-g4295c51

[Anton Gladky]

The following commit has been merged in the master branch:
commit ed342804002991403815629a25acafc57a57396f
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Mar 11 21:49:37 2012 +0100

    Update patches.

diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index 96804c7..7c14571 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
-@@ -935,7 +935,7 @@
+@@ -999,7 +999,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)
-@@ -945,7 +945,7 @@
+@@ -1009,7 +1009,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 236b05f..3cd48dc 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
-@@ -953,7 +953,7 @@
+@@ -1017,7 +1017,7 @@
    message("WARNING: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library wont link. "
            "Change in msvc /MT flag to /MD in the shared project properties")
  endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)		  
@@ -23,7 +23,7 @@ Last-Update: 2011-12-09
  
  # binary targets
  if(HAVE_FLTK)
-@@ -968,7 +968,7 @@
+@@ -1032,7 +1032,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 ab2fa5f..e67d821 100644
--- a/debian/patches/fix_spelling_errors.patch
+++ b/debian/patches/fix_spelling_errors.patch
@@ -15,7 +15,7 @@ Last-Update: 2011-12-09
      "Plugin(Bubbles) creates one `.geo' file.";
 --- a/contrib/lbfgs/alglibinternal.cpp
 +++ b/contrib/lbfgs/alglibinternal.cpp
-@@ -3120,8 +3120,8 @@
+@@ -3679,8 +3679,8 @@
          {
              return;
          }
@@ -26,7 +26,7 @@ Last-Update: 2011-12-09
          
          /*
           * beta*y
-@@ -3157,8 +3157,8 @@
+@@ -3716,8 +3716,8 @@
          {
              return;
          }
@@ -39,7 +39,7 @@ Last-Update: 2011-12-09
           * beta*y
 --- a/doc/texinfo/gmsh.texi
 +++ b/doc/texinfo/gmsh.texi
-@@ -1395,7 +1395,7 @@
+@@ -1398,7 +1398,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
@@ -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
-@@ -2905,7 +2905,7 @@
+@@ -2921,7 +2921,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 a7c7ca5..0028c25 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
-@@ -1010,7 +1010,7 @@
+@@ -1074,7 +1074,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/?*.*)
-@@ -1105,7 +1105,7 @@
+@@ -1169,7 +1169,7 @@
  if(MAKEINFO AND TEXI2PDF)
    add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf 
                      ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz

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