[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 6e12760a6d5cd18793ef34f26d87432f3d2b2864
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Mar 11 21:50:19 2012 +0100

    Remove use_libann.patch. Was applied by upstream.

diff --git a/debian/patches/series b/debian/patches/series
index e9ac952..39af4ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ change_shared_library_name.patch
 skip_license_file.patch
 fix_spelling_errors.patch
 delete_gl2ps_from_source.patch
-use_libann.patch
 switch_from_opencascade_to_oce.patch
diff --git a/debian/patches/use_libann.patch b/debian/patches/use_libann.patch
deleted file mode 100644
index fd30b7b..0000000
--- a/debian/patches/use_libann.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Desctiption: use packaged version of libann instead of shipped with tarball
-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
-@@ -451,9 +451,19 @@
- endif(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
- 
- if(ENABLE_ANN)
--  add_subdirectory(contrib/ANN)
--  include_directories(contrib/ANN/include)
--  set_config_option(HAVE_ANN "Ann")
-+    find_library(ANN_LIB ann PATH_SUFFIXES lib)
-+    if(ANN_LIB)
-+      find_path(ANN_INC "ANN.h" PATH_SUFFIXES src include ANN)
-+      if(ANN_INC)
-+        list(APPEND EXTERNAL_LIBRARIES ${ANN_LIB})
-+        list(APPEND EXTERNAL_INCLUDES ${ANN_INC})
-+      endif(ANN_INC)
-+    else(ANN_LIB)
-+       message(STATUS "ANN " ${ANN_LIB} " not Found - using contrib/ann instead")
-+       add_subdirectory(contrib/ANN)
-+       include_directories(contrib/ANN/include)
-+    endif(ANN_LIB)
-+    set_config_option(HAVE_ANN "Ann")
- endif(ENABLE_ANN)
- 
- if(ENABLE_BLOSSOM)

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