[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 gladky.anton at gmail.com
Sun Mar 11 20:51:38 UTC 2012


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

    Remove use_gmm.patch. Was applied by upstream.

diff --git a/debian/patches/series b/debian/patches/series
index 41d2a71..e9ac952 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@ change_shared_library_name.patch
 skip_license_file.patch
 fix_spelling_errors.patch
 delete_gl2ps_from_source.patch
-use_gmm.patch
 use_libann.patch
 switch_from_opencascade_to_oce.patch
diff --git a/debian/patches/use_gmm.patch b/debian/patches/use_gmm.patch
deleted file mode 100644
index c7496c4..0000000
--- a/debian/patches/use_gmm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Desctiption: use packaged version of gmm instead of shipped with tarball
- Patch will have an effect, when getfem++ will be able to migrate to testing.
- Requires BD on libgmm++-dev
-Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-01-16
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -482,7 +482,13 @@
- endif(ENABLE_DINTEGRATION)
- 
- if(ENABLE_GMM)
--  include_directories(contrib/gmm)
-+  find_path(GMM_INC "gmm.h" PATH_SUFFIXES src include include/gmm)
-+  if(GMM_INC)
-+    list(APPEND EXTERNAL_INCLUDES ${GMM_INC})
-+  else(GMM_INC)
-+    message(STATUS "GMM " ${GMM_INC} " not Found - using contrib/gmm instead")
-+    include_directories(contrib/gmm)
-+  endif(GMM_INC)
-   set_config_option(HAVE_GMM "Gmm")
- endif(ENABLE_GMM)
- 

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



More information about the debian-science-commits mailing list