[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. upstream/2.5.1_beta2_svn10875_dfsg-93-gf604741

[Anton Gladky]

The following commit has been merged in the master branch:
commit f6047410d3f4c5f5b4fe3ebb3f544582012bf550
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Jan 17 20:44:57 2012 +0100

    Refersh patches

diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index a532baf..6374015 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
-@@ -933,7 +933,7 @@
+@@ -949,7 +949,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)
-@@ -948,7 +948,7 @@
+@@ -964,7 +964,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/use_gmm.patch b/debian/patches/use_gmm.patch
index 02c8f75..c7496c4 100644
--- a/debian/patches/use_gmm.patch
+++ b/debian/patches/use_gmm.patch
@@ -7,7 +7,7 @@ Last-Update: 2012-01-16
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -482,7 +482,12 @@
+@@ -482,7 +482,13 @@
  endif(ENABLE_DINTEGRATION)
  
  if(ENABLE_GMM)
diff --git a/debian/patches/use_tetgen.patch b/debian/patches/use_tetgen.patch
index 44d6c84..e0cb8e3 100644
--- a/debian/patches/use_tetgen.patch
+++ b/debian/patches/use_tetgen.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-01-05
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -567,6 +567,18 @@
+@@ -568,6 +568,18 @@
      message("WARNING: By including Tetgen you have to comply with Tetgen's "
              "special licensing requirements stated in contrib/Tetgen/LICENSE.")
    endif(ENABLE_TETGEN_NEW AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/TetgenNew/tetgen.h)

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