[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 b1f3470539d1739a6e1ccbc7dad5d9312c5cdd16
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Mar 11 21:42:08 2012 +0100

    Remove use_mmg3d.patch. Was applied by upstream.

diff --git a/debian/patches/series b/debian/patches/series
index aeaaa54..41d2a71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ change_shared_library_name.patch
 skip_license_file.patch
 fix_spelling_errors.patch
 delete_gl2ps_from_source.patch
-use_mmg3d.patch
 use_gmm.patch
 use_libann.patch
 switch_from_opencascade_to_oce.patch
diff --git a/debian/patches/use_mmg3d.patch b/debian/patches/use_mmg3d.patch
deleted file mode 100644
index 2d1fc4d..0000000
--- a/debian/patches/use_mmg3d.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Desctiption: use packaged version of mmg3d instead of shipped with tarball,
- when it appears in Debian. See #651438
-Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-02-10
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -548,8 +548,18 @@
-   endif(ENABLE_BAMG)
- 
-   if(ENABLE_MMG3D)
--    add_subdirectory(contrib/mmg3d)
--    include_directories(contrib/mmg3d/build/sources)
-+    find_path(MMG3D_INC "libmmg3d.h" PATH_SUFFIXES src include)
-+    if(MMG3D_INC)
-+       list(APPEND EXTERNAL_INCLUDES ${MMG3D_INC})
-+       find_library(MMG3D_LIB mmg3dlib4.0 PATH_SUFFIXES lib)
-+       if(MMG3D_LIB)
-+           list(APPEND EXTERNAL_LIBRARIES ${MMG3D_LIB})
-+       endif(MMG3D_LIB)
-+    else(MMG3D_INC)
-+       message(STATUS "MMG3D " ${MMG3D_INC} " not Found - using contrib/mmg3d instead")
-+       add_subdirectory(contrib/mmg3d)
-+       include_directories(contrib/mmg3d/build/sources)
-+    endif(MMG3D_INC)
-     set_config_option(HAVE_MMG3D "Mmg3d")
-   endif(ENABLE_MMG3D)
- 

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