[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. debian/2.5.1_beta2_svn11845_dfsg-2-12-g0baf713

[Anton Gladky]

The following commit has been merged in the master branch:
commit af319a2cb68320499533a193ec5466a605dbbbe2
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu May 24 20:54:53 2012 +0200

    Remove switch_from_opencascade_to_oce.patch. Applied by upstream.

diff --git a/debian/patches/series b/debian/patches/series
index 95f1bc8..d34e584 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-switch_from_opencascade_to_oce.patch
 api_demos.patch
 fix_FTBFS_linking.patch
diff --git a/debian/patches/switch_from_opencascade_to_oce.patch b/debian/patches/switch_from_opencascade_to_oce.patch
deleted file mode 100644
index eddcabe..0000000
--- a/debian/patches/switch_from_opencascade_to_oce.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: switch from opencascade to oce
-Origin: http://www.geuz.org/pipermail/gmsh/2011/006731.html
-Author: D. Barbier <bouzim at gmail.com>
-Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-02-10
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -804,15 +804,6 @@
- endif(HAVE_SOLVER)
- 
- if(ENABLE_OCC)
--  if(WIN32 OR CYGWIN)
--    if(HAVE_64BIT_SIZE_T)
--      set(OCC_SYS_NAME win64)
--    else(HAVE_64BIT_SIZE_T)
--      set(OCC_SYS_NAME win32)
--    endif(HAVE_64BIT_SIZE_T)
--  else(WIN32 OR CYGWIN)
--    set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
--  endif(WIN32 OR CYGWIN)
-   set(OCC_LIBS_REQUIRED
-       # subset of DataExchange
-       TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -823,6 +814,30 @@
-       TKBRep TKGeomBase TKG3d TKG2d
-       # FoundationClasses
-       TKAdvTools TKMath TKernel)
-+  # First try to detect OpenCascade Community Edition, based on CMake
-+  find_package(OCE QUIET COMPONENTS ${OCC_LIBS_REQUIRED})
-+  if(OCE_ALL_FOUND)
-+    list(APPEND EXTERNAL_LIBRARIES ${OCC_LIBS_REQUIRED})
-+    list(APPEND EXTERNAL_INCLUDES ${OCE_INCLUDE_DIRS})
-+    set_config_option(HAVE_OCC "OpenCascade(OCE)")
-+    add_definitions(-DHAVE_NO_OCC_CONFIG_H)
-+    if(HAVE_64BIT_SIZE_T)
-+      add_definitions(-D_OCC64)
-+    endif(HAVE_64BIT_SIZE_T)
-+    if(CYGWIN)
-+      list(APPEND EXTERNAL_LIBRARIES "winspool")
-+    elseif(MSVC)
-+      add_definitions(-DWNT)
-+    endif(CYGWIN)
-+  else(OCE_ALL_FOUND)
-+    if(OCE_FOUND)
-+      message(STATUS "Found OCE version ${OCE_VERSION}, but those libraries are missing: " ${OCE_MISSING_TOOLKITS})
-+    endif(OCE_FOUND)
-+    if(WIN32 OR CYGWIN)
-+      set(OCC_SYS_NAME win32)
-+    else(WIN32 OR CYGWIN)
-+      set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
-+    endif(WIN32 OR CYGWIN)
-   list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
-   set(OCC_LIBS)
-   foreach(OCC ${OCC_LIBS_REQUIRED})
-@@ -859,6 +874,7 @@
-       endif(NOT OCC_CONFIG_H)
-     endif(OCC_INC)
-   endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
-+  endif(OCE_ALL_FOUND)
-   if(HAVE_OCC AND ENABLE_SALOME)
-     add_subdirectory(contrib/Salome)
-     include_directories(contrib/Salome)

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