[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. debian/2.6.0.dfsg-3-4-g5dcda2b

Anton Gladky gladky.anton at gmail.com
Thu Jul 19 17:32:09 UTC 2012


The following commit has been merged in the master branch:
commit 27552ae566a59912046e2ed021e627cc91ebd304
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Jul 19 19:31:01 2012 +0200

    Refresh patches.

diff --git a/debian/patches/add-missing-headers.patch b/debian/patches/add-missing-headers.patch
index 89c508c..0d71e7c 100644
--- a/debian/patches/add-missing-headers.patch
+++ b/debian/patches/add-missing-headers.patch
@@ -13,15 +13,12 @@ Last-Update: 2012-06-24
    Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
      Numeric/JacobianBasis.h Numeric/fullMatrix.h
      Numeric/simpleFunction.h Numeric/cartesian.h
-@@ -96,16 +97,21 @@
-     Geo/SVector3.h Geo/STensor3.h Geo/SBoundingBox3d.h Geo/Pair.h Geo/Range.h 
-     Geo/SOrientedBoundingBox.h Geo/CellComplex.h Geo/ChainComplex.h Geo/Cell.h
+@@ -98,14 +99,16 @@
      Geo/Homology.h Geo/Chain.h Geo/partitionEdge.h Geo/CGNSOptions.h Geo/gmshLevelset.h
-+    Geo/Chain.h
-   Mesh/meshGEdge.h Mesh/meshGFace.h Mesh/meshGFaceOptimize.h Mesh/meshPartition.h
-     Mesh/meshGFaceDelaunayInsertion.h Mesh/simple3D.h Mesh/meshPartitionOptions.h 
-     Mesh/directions3D.h Mesh/Voronoi3D.h Mesh/Levy3D.h Mesh/periodical.h
-+    Mesh/Field.h
+   Mesh/meshGEdge.h Mesh/meshGFace.h Mesh/meshGFaceOptimize.h Mesh/meshGFaceElliptic.h Mesh/meshPartition.h
+     Mesh/meshGFaceDelaunayInsertion.h Mesh/simple3D.h Mesh/meshPartitionOptions.h Mesh/directions3D.h Mesh/yamakawa.h
+-    Mesh/Voronoi3D.h Mesh/Levy3D.h Mesh/periodical.h
++    Mesh/Voronoi3D.h Mesh/Levy3D.h Mesh/periodical.h Mesh/Field.h
    Numeric/mathEvaluator.h
    Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
      Solver/crossConfTerm.h Solver/orthogonalTerm.h
@@ -29,9 +26,9 @@ Last-Update: 2012-06-24
      Solver/linearSystemFull.h Solver/elasticitySolver.h Solver/sparsityPattern.h 
 +    Solver/functionSpace.h Solver/STensor43.h Solver/STensor33.h
    Post/PView.h Post/PViewData.h Plugin/PluginManager.h Post/OctreePost.h
-+    Post/ColorTable.h Post/PViewOptions.h Post/PViewData.h
-   Graphics/drawContext.h
-+    Graphics/Camera.h Graphics/Trackball.h
+-  Graphics/drawContext.h
++  Post/ColorTable.h Post/PViewOptions.h
++  Graphics/drawContext.h Graphics/Camera.h Graphics/Trackball.h
    contrib/kbipack/gmp_normal_form.h contrib/kbipack/gmp_matrix.h 
      contrib/kbipack/gmp_blas.h contrib/kbipack/mpz.h
    contrib/DiscreteIntegration/Integration3D.h
diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index 96ee511..7dc54ad 100644
--- a/debian/patches/delete_gl2ps_from_source.patch
+++ b/debian/patches/delete_gl2ps_from_source.patch
@@ -14,7 +14,7 @@ Last-Update: 2011-12-09
    gl2png.cpp
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1070,7 +1070,7 @@
+@@ -1068,7 +1068,7 @@
    add_executable(gmsh_dynamic EXCLUDE_FROM_ALL Common/Main.cpp)
    target_link_libraries(gmsh_dynamic shared)
  endif(HAVE_FLTK)
diff --git a/debian/patches/skip_license_file.patch b/debian/patches/skip_license_file.patch
index bb83d12..b5e4541 100644
--- a/debian/patches/skip_license_file.patch
+++ b/debian/patches/skip_license_file.patch
@@ -4,7 +4,7 @@ Last-Update: 2011-12-09
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1112,7 +1112,7 @@
+@@ -1110,7 +1110,7 @@
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -13,7 +13,7 @@ Last-Update: 2011-12-09
  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/?*.*)
-@@ -1207,7 +1207,7 @@
+@@ -1205,7 +1205,7 @@
  if(MAKEINFO AND TEXI2PDF)
    add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf 
                      ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz

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



More information about the debian-science-commits mailing list