[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. debian/2.7.1.dfsg-3-3-g5736abd
Anton Gladky
gladky.anton at gmail.com
Thu Jul 11 21:40:57 UTC 2013
The following commit has been merged in the master branch:
commit 5736abd5bc379bd47d0c50d688785250622cd3ba
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Thu Jul 11 23:39:58 2013 +0200
Update patches, remove applied by upstream ones.
diff --git a/debian/patches/add_missing_header.patch b/debian/patches/add_missing_header.patch
deleted file mode 100644
index eca2506..0000000
--- a/debian/patches/add_missing_header.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: add missing header in libgmsh-dev package.
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: #713942
-Last-Update: 2013-06-24
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,7 +106,7 @@
- Geo/SPoint2.h Geo/SPoint3.h 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 Geo/Homology.h Geo/Chain.h
-- Geo/partitionEdge.h Geo/CGNSOptions.h Geo/gmshLevelset.h
-+ Geo/partitionEdge.h Geo/CGNSOptions.h Geo/gmshLevelset.h Geo/boundaryLayersData.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
diff --git a/debian/patches/alauzet.patch b/debian/patches/alauzet.patch
index 866c000..7168399 100644
--- a/debian/patches/alauzet.patch
+++ b/debian/patches/alauzet.patch
@@ -1,6 +1,6 @@
--- a/Mesh/Field.cpp
+++ b/Mesh/Field.cpp
-@@ -531,6 +531,55 @@
+@@ -480,6 +480,55 @@
}
};
@@ -56,7 +56,7 @@
class FrustumField : public Field
{
double x1,y1,z1;
-@@ -1332,17 +1381,21 @@
+@@ -1281,17 +1330,21 @@
}
virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
{
@@ -78,7 +78,7 @@
}
v = intersection_conserve_mostaniso(v,ff);
}
-@@ -1380,6 +1433,77 @@
+@@ -1329,6 +1382,77 @@
}
};
@@ -156,7 +156,7 @@
class MinField : public Field
{
std::list<int> idlist;
-@@ -1398,7 +1522,18 @@
+@@ -1347,7 +1471,18 @@
double v = MAX_LC;
for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
Field *f = (GModel::current()->getFields()->get(*it));
@@ -176,7 +176,7 @@
}
return v;
}
-@@ -1426,7 +1561,18 @@
+@@ -1375,7 +1510,18 @@
double v = -MAX_LC;
for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
Field *f = (GModel::current()->getFields()->get(*it));
@@ -196,22 +196,22 @@
}
return v;
}
-@@ -2112,6 +2258,7 @@
+@@ -2051,6 +2197,7 @@
#endif
map_type_name["Box"] = new FieldFactoryT<BoxField>();
map_type_name["Cylinder"] = new FieldFactoryT<CylinderField>();
+ map_type_name["Sphere"] = new FieldFactoryT<SphereField>();
map_type_name["Frustum"] = new FieldFactoryT<FrustumField>();
map_type_name["LonLat"] = new FieldFactoryT<LonLatField>();
- map_type_name["XY2d2LonLat"] = new FieldFactoryT<XY2d2LonLatField>();
-@@ -2122,6 +2269,7 @@
+ #if defined(HAVE_POST)
+@@ -2060,6 +2207,7 @@
map_type_name["Restrict"] = new FieldFactoryT<RestrictField>();
map_type_name["Min"] = new FieldFactoryT<MinField>();
map_type_name["MinAniso"] = new FieldFactoryT<MinAnisoField>();
+ map_type_name["IntersectAniso"] = new FieldFactoryT<IntersectAnisoField>();
map_type_name["Max"] = new FieldFactoryT<MaxField>();
- map_type_name["UTM"] = new FieldFactoryT<UTMField>();
map_type_name["Laplacian"] = new FieldFactoryT<LaplacianField>();
+ map_type_name["Mean"] = new FieldFactoryT<MeanField>();
--- a/Geo/STensor3.h
+++ b/Geo/STensor3.h
@@ -173,6 +173,8 @@
diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index d7325e7..d8257a2 100644
--- a/debian/patches/change_shared_library_name.patch
+++ b/debian/patches/change_shared_library_name.patch
@@ -19,7 +19,7 @@ Last-Update: 2012-11-28
POST_BUILD # do the rest of the command after the build period
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1110,7 +1110,7 @@
+@@ -1160,7 +1160,7 @@
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -28,7 +28,7 @@ Last-Update: 2012-11-28
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1123,10 +1123,10 @@
+@@ -1173,10 +1173,10 @@
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
add_library(shared SHARED ${GMSH_SRC})
diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index 604fe9e..b520294 100644
--- a/debian/patches/delete_gl2ps_from_source.patch
+++ b/debian/patches/delete_gl2ps_from_source.patch
@@ -14,7 +14,7 @@ Last-Update: 2012-11-28
gl2png.cpp
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1157,7 +1157,7 @@
+@@ -1207,7 +1207,7 @@
add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
diff --git a/debian/patches/fix_FTBFS_linking.patch b/debian/patches/fix_FTBFS_linking.patch
index 1facd2e..d4c2aee 100644
--- a/debian/patches/fix_FTBFS_linking.patch
+++ b/debian/patches/fix_FTBFS_linking.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-11-28
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1150,7 +1150,7 @@
+@@ -1200,7 +1200,7 @@
message(STATUS "Note: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library "
"won't link. In MSVC change /MT to /MD in the shared project properties")
endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)
diff --git a/debian/patches/fix_gmshpy_import.patch b/debian/patches/fix_gmshpy_import.patch
index 2230364..b854a6f 100644
--- a/debian/patches/fix_gmshpy_import.patch
+++ b/debian/patches/fix_gmshpy_import.patch
@@ -12,4 +12,4 @@ Last-Update: 2013-01-26
+
import signal
signal.signal(signal.SIGINT, signal.SIG_DFL)
- ${GMSH_PYTHON_MODULES_INCLUDE_CODE}
+ ${GMSH_PYTHON_OPENMPI_HACK}
diff --git a/debian/patches/fix_libdir.patch b/debian/patches/fix_libdir.patch
index 08f2e5e..48343d6 100644
--- a/debian/patches/fix_libdir.patch
+++ b/debian/patches/fix_libdir.patch
@@ -15,7 +15,7 @@ Last-Update: 2013-03-15
+ DESTINATION ${INSTALL_LIB_DIR})
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1289,10 +1289,10 @@
+@@ -1339,7 +1339,7 @@
# (e.g. "make lib" or "make shared" followed by "make install/fast")
install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
if(ENABLE_BUILD_LIB)
@@ -23,8 +23,13 @@ Last-Update: 2013-03-15
+ install(TARGETS lib DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
-- install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
-+ install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
+ if(WIN32 AND NOT MSVC OR CYGWIN)
+@@ -1358,7 +1358,7 @@
+ install(FILES ${GCC_DLL} ${GFORTRAN_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
+ endif(GCC_DLL AND GFORTRAN_DLL AND STDC_DLL)
+ else(WIN32 AND NOT MSVC OR CYGWIN)
+- install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
++ install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
+ endif(WIN32 AND NOT MSVC OR CYGWIN)
endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
- install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN})
diff --git a/debian/patches/fix_script_header.patch b/debian/patches/fix_script_header.patch
index 3672f48..da95e50 100644
--- a/debian/patches/fix_script_header.patch
+++ b/debian/patches/fix_script_header.patch
@@ -4,7 +4,11 @@ Last-Update: 2013-05-12
--- a/contrib/onelab/python/onelab.py
+++ b/contrib/onelab/python/onelab.py
-@@ -1,3 +1,4 @@
+@@ -26,7 +26,7 @@
+ Please report all bugs and problems to the public mailing list
+ <gmsh at geuz.org>.
+ """
+-
+#!/usr/bin/env python
import socket, struct, os, sys
_VERSION = '1.05'
diff --git a/debian/patches/fix_spelling_errors.patch b/debian/patches/fix_spelling_errors.patch
deleted file mode 100644
index 3ecc049..0000000
--- a/debian/patches/fix_spelling_errors.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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
-@@ -30,7 +30,7 @@
- {
- return "Plugin(Bubbles) constructs a geometry consisting of "
- "`bubbles' inscribed in the Voronoi of an input triangulation. "
-- "`ShrinkFactor' allows to change the size of the bubbles. "
-+ "`ShrinkFactor' allows one to change the size of the bubbles. "
- "The plugin expects a triangulation in the `z = 0' plane to exist "
- "in the current model.\n\n"
- "Plugin(Bubbles) creates one `.geo' file.";
---- a/contrib/lbfgs/alglibinternal.cpp
-+++ b/contrib/lbfgs/alglibinternal.cpp
-@@ -3679,8 +3679,8 @@
- {
- return;
- }
-- ae_assert(j2-j1==ix2-ix1, "MatrixVectorMultiply: A and X dont match!", _state);
-- ae_assert(i2-i1==iy2-iy1, "MatrixVectorMultiply: A and Y dont match!", _state);
-+ ae_assert(j2-j1==ix2-ix1, "MatrixVectorMultiply: A and X don't match!", _state);
-+ ae_assert(i2-i1==iy2-iy1, "MatrixVectorMultiply: A and Y don't match!", _state);
-
- /*
- * beta*y
-@@ -3716,8 +3716,8 @@
- {
- return;
- }
-- ae_assert(i2-i1==ix2-ix1, "MatrixVectorMultiply: A and X dont match!", _state);
-- ae_assert(j2-j1==iy2-iy1, "MatrixVectorMultiply: A and Y dont match!", _state);
-+ ae_assert(i2-i1==ix2-ix1, "MatrixVectorMultiply: A and X don't match!", _state);
-+ ae_assert(j2-j1==iy2-iy1, "MatrixVectorMultiply: A and Y don't match!", _state);
-
- /*
- * beta*y
---- a/doc/texinfo/gmsh.texi
-+++ b/doc/texinfo/gmsh.texi
-@@ -1093,7 +1093,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
--allows to ask the user for a value interactively. The various
-+allows one to ask the user for a value interactively. The various
- @w{@var{char-option}s} are listed in @ref{Options}.
-
- Character expressions are mostly used to specify non-numeric options and
-@@ -2628,7 +2628,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)
--normal field. Specifying a boundary layer index allows to extrude
-+normal field. Specifying a boundary layer index allows one to extrude
- several independent boundary layers (with independent normal smoothing).
-
- @item Transfinite Line @{ @var{expression-list} @} | "*" = @var{expression} < Using Progression | Bump @var{expression} >;
diff --git a/debian/patches/series b/debian/patches/series
index 030e176..95a331b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
change_shared_library_name.patch
skip_license_file.patch
-fix_spelling_errors.patch
delete_gl2ps_from_source.patch
switch_from_opencascade_to_oce.patch
fix_FTBFS_linking.patch
@@ -8,4 +7,3 @@ alauzet.patch
fix_gmshpy_import.patch
fix_libdir.patch
fix_script_header.patch
-add_missing_header.patch
diff --git a/debian/patches/skip_license_file.patch b/debian/patches/skip_license_file.patch
index ff9e033..6a74182 100644
--- a/debian/patches/skip_license_file.patch
+++ b/debian/patches/skip_license_file.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-11-28
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1206,7 +1206,7 @@
+@@ -1256,7 +1256,7 @@
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -13,7 +13,7 @@ Last-Update: 2012-11-28
set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
set(ONELAB_PY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py)
file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
-@@ -1329,7 +1329,7 @@
+@@ -1398,7 +1398,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_from_opencascade_to_oce.patch b/debian/patches/switch_from_opencascade_to_oce.patch
index 3d7efa6..a5b0719 100644
--- a/debian/patches/switch_from_opencascade_to_oce.patch
+++ b/debian/patches/switch_from_opencascade_to_oce.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-02-10
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -889,15 +889,6 @@
+@@ -924,15 +924,6 @@
endif(HAVE_SOLVER)
if(ENABLE_OCC)
@@ -22,7 +22,7 @@ Last-Update: 2012-02-10
set(OCC_LIBS_REQUIRED
# subset of DataExchange
TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -908,6 +899,30 @@
+@@ -943,6 +934,30 @@
TKBRep TKGeomBase TKG3d TKG2d
# FoundationClasses
TKAdvTools TKMath TKernel)
@@ -53,7 +53,7 @@ Last-Update: 2012-02-10
list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
set(OCC_LIBS)
foreach(OCC ${OCC_LIBS_REQUIRED})
-@@ -943,6 +958,7 @@
+@@ -978,6 +993,7 @@
endif(NOT OCC_CONFIG_H)
endif(OCC_INC)
endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
--
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator.
More information about the debian-science-commits
mailing list