[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. upstream/2.5.1_beta2_svn10284_dfsg-60-gd1da439

Fri Dec 9 21:44:17 UTC 2011

The following commit has been merged in the master branch:
commit d1da4394a20c8007a6924c3a4b5530329c9b29c0
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Dec 9 22:44:04 2011 +0100

    Update old patches

diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index 953cb90..840b2ac 100644
--- a/debian/patches/change_shared_library_name.patch
+++ b/debian/patches/change_shared_library_name.patch
@@ -1,9 +1,10 @@
 Description: Change name of shared library
 Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-12-09
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -885,7 +885,7 @@
+@@ -915,7 +915,7 @@
  # want to build the lib we need to recompile everything (the first
  # time--it's a separate target)
  add_library(lib STATIC EXCLUDE_FROM_ALL ${GMSH_SRC})
@@ -12,7 +13,7 @@ Author: Anton Gladky <gladky.anton at gmail.com>
  if(MSVC)
    set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
    if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -895,7 +895,7 @@
+@@ -925,7 +925,7 @@
  
  # shared library target: we don't build it by default either
  add_library(shared SHARED EXCLUDE_FROM_ALL ${GMSH_SRC})
diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index 9ebfbf1..a532baf 100644
--- a/debian/patches/delete_gl2ps_from_source.patch
+++ b/debian/patches/delete_gl2ps_from_source.patch
@@ -1,6 +1,6 @@
 Description: delete gl2ps and use packaged version.
 Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
-Last-Update: 2011-07-10
+Last-Update: 2011-12-09
 
 --- a/Graphics/CMakeLists.txt
 +++ b/Graphics/CMakeLists.txt
@@ -14,7 +14,7 @@ Last-Update: 2011-07-10
    gl2png.cpp
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -912,7 +912,7 @@
+@@ -933,7 +933,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,9 +23,9 @@ Last-Update: 2011-07-10
  
  # binary targets
  if(HAVE_FLTK)
-@@ -925,7 +925,7 @@
- else(HAVE_FLTK)
-   add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
+@@ -948,7 +948,7 @@
+   add_executable(gmsh_dynamic EXCLUDE_FROM_ALL Common/Main.cpp)
+   target_link_libraries(gmsh_dynamic shared)
  endif(HAVE_FLTK)
 -target_link_libraries(gmsh ${LINK_LIBRARIES})
 +target_link_libraries(gmsh ${LINK_LIBRARIES} -lgl2ps -lGL -lglut)
diff --git a/debian/patches/fix_spelling_errors.patch b/debian/patches/fix_spelling_errors.patch
index f19d7cc..ab2fa5f 100644
--- a/debian/patches/fix_spelling_errors.patch
+++ b/debian/patches/fix_spelling_errors.patch
@@ -1,5 +1,6 @@
 Desctiption: fixes some spelling errors
 Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-12-09
 
 --- a/Plugin/Bubbles.cpp
 +++ b/Plugin/Bubbles.cpp
@@ -38,7 +39,7 @@ Author: Anton Gladky <gladky.anton at gmail.com>
           * beta*y
 --- a/doc/texinfo/gmsh.texi
 +++ b/doc/texinfo/gmsh.texi
-@@ -1388,7 +1388,7 @@
+@@ -1395,7 +1395,7 @@
  etc.). The eigth case permits to use the value of a @var{char-option} as
  a @var{char-expression}. The ninth case gets the value of an environment
  variable from the operating system. The last case in the definition
@@ -47,7 +48,7 @@ Author: Anton Gladky <gladky.anton at gmail.com>
  @w{@var{char-option}s} are listed in @ref{Options}.
  
  Character expressions are mostly used to specify non-numeric options and
-@@ -2895,7 +2895,7 @@
+@@ -2905,7 +2905,7 @@
  @item Extrude @{ Surface @{ @var{expression-list} @}; @var{layers} < Using Index[@var{expr}]; > < Using View[@var{expr}]; > @}
  Extrudes a boundary layer from the specified surfaces. If no view is
  specified, the boundary layer is created using gouraud-shaped (smoothed)
diff --git a/debian/patches/skip_license_file.patch b/debian/patches/skip_license_file.patch
index 437ddba..9539afa 100644
--- a/debian/patches/skip_license_file.patch
+++ b/debian/patches/skip_license_file.patch
@@ -1,9 +1,10 @@
 Description: skips LICENSE.txt during installation. All information is in debian/copyright.
 Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-12-09
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -976,7 +976,7 @@
+@@ -990,7 +990,7 @@
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -12,7 +13,7 @@ Author: Anton Gladky <gladky.anton at gmail.com>
  set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
  file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
  file(GLOB DEMO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/demos/?*.*)
-@@ -1072,7 +1072,7 @@
+@@ -1085,7 +1085,7 @@
  if(MAKEINFO AND TEXI2PDF)
    add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf 
                      ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
diff --git a/debian/patches/switch_off_metis_and_tetgen.patch b/debian/patches/switch_off_metis_and_tetgen.patch
index 3c8414a..89f8234 100644
--- a/debian/patches/switch_off_metis_and_tetgen.patch
+++ b/debian/patches/switch_off_metis_and_tetgen.patch
@@ -1,10 +1,10 @@
 Description: Switch off some options.
 Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-07-06
+Last-Update: 2011-12-09
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
  option(ENABLE_MATHEX "Enable MathEx expression parser" ON)
  option(ENABLE_MED "Enable MED mesh and post-processing file formats" ON)
  option(ENABLE_MESH "Build the mesh module" ON)
@@ -13,14 +13,14 @@ Last-Update: 2011-07-06
  option(ENABLE_MMG3D "Enable 3D Mobile Mesh Generation" ON)
  option(ENABLE_MPEG_ENCODE "Enable built-in MPEG encoder" ON)
  option(ENABLE_MPI "Enable MPI parallelization" OFF)
-@@ -54,8 +54,8 @@
+@@ -53,8 +53,8 @@
+ option(ENABLE_SALOME "Enable Salome routines for CAD healing" ON)
  option(ENABLE_SLEPC "Enable SLEPc eigensolvers" ON)
  option(ENABLE_SOLVER "Enable solver components" ON)
- option(ENABLE_SWIG "Enable swig" ON)
 -option(ENABLE_TAUCS "Enable Taucs linear algebra solver" ON)
 -option(ENABLE_TETGEN "Enable Tetgen mesh generator" ON)
 +option(ENABLE_TAUCS "Enable Taucs linear algebra solver" OFF)
 +option(ENABLE_TETGEN "Enable Tetgen mesh generator" OFF)
  option(ENABLE_TETGEN_NEW "Enable experimental version of Tetgen" OFF)
- 
- set(GMSH_MAJOR_VERSION 2)
+ option(ENABLE_WRAP_JAVA "Build Java wrappers" OFF)
+ option(ENABLE_WRAP_PYTHON "Build Python wrappers" ON)

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

