r45858 - in /packages/gmsh-tetgen/trunk/debian: ./ patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Mon May 13 11:39:58 UTC 2013
Author: trophime-guest
Date: Mon May 13 11:39:57 2013
New Revision: 45858
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45858
Log:
update to 2.7.2 rev
Modified:
packages/gmsh-tetgen/trunk/debian/changelog
packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch
packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch
packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch
Modified: packages/gmsh-tetgen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/changelog?rev=45858&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/changelog (original)
+++ packages/gmsh-tetgen/trunk/debian/changelog Mon May 13 11:39:57 2013
@@ -1,3 +1,9 @@
+gmsh-tetgen (2.7.2~svn15508-1) unstable; urgency=low
+
+ * Update to 2.7.2 rev
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Mon, 13 May 2013 13:38:00 +0200
+
gmsh-tetgen (2.7.1~svn15090-1) unstable; urgency=low
* Update to 2.7.1 rev
Modified: packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch?rev=45858&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch Mon May 13 11:39:57 2013
@@ -3,11 +3,11 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-06-24
-Index: gmsh-tetgen-2.6.2~svn13116/CMakeLists.txt
+Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.6.2~svn13116.orig/CMakeLists.txt 2012-09-05 11:24:52.000000000 +0200
-+++ gmsh-tetgen-2.6.2~svn13116/CMakeLists.txt 2012-09-05 11:27:23.000000000 +0200
-@@ -58,7 +58,7 @@
+--- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt 2013-05-13 13:10:41.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt 2013-05-13 13:14:16.000000000 +0200
+@@ -64,7 +64,7 @@
option(ENABLE_PETSC "Enable PETSc linear algebra solvers" ${DEFAULT})
option(ENABLE_PLUGINS "Build the post-processing plugins" ${DEFAULT})
option(ENABLE_POST "Build the post-processing module" ${DEFAULT})
@@ -16,7 +16,7 @@
option(ENABLE_QT "Build proof-of-concept QT GUI" OFF)
option(ENABLE_RTREE "Enable RTREE" ${DEFAULT})
option(ENABLE_SALOME "Enable Salome routines for CAD healing" ${DEFAULT})
-@@ -86,6 +86,7 @@
+@@ -92,6 +92,7 @@
Common/Gmsh.h Common/Context.h Common/GmshDefines.h Common/GmshMessage.h
Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h
Common/OS.h Common/StringUtils.h Common/OpenFile.h
@@ -24,10 +24,10 @@
Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
Numeric/JacobianBasis.h Numeric/fullMatrix.h
Numeric/simpleFunction.h Numeric/cartesian.h
-@@ -101,11 +102,13 @@
+@@ -107,11 +108,13 @@
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
+ Geo/Chain.h
Mesh/meshGEdge.h Mesh/meshGFace.h Mesh/meshGFaceOptimize.h
Mesh/meshGFaceElliptic.h Mesh/meshPartition.h Mesh/meshGFaceDelaunayInsertion.h
@@ -39,7 +39,7 @@
Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
Solver/crossConfTerm.h Solver/orthogonalTerm.h
Solver/linearSystem.h Solver/linearSystemGMM.h Solver/linearSystemCSR.h
-@@ -113,8 +116,9 @@
+@@ -119,8 +122,9 @@
Solver/groupOfElements.h Solver/linearSystemPETSc.h
Post/PView.h Post/PViewData.h Plugin/PluginManager.h Post/OctreePost.h
Post/PViewDataGModel.h Post/PViewOptions.h Post/ColorTable.h
Modified: packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch?rev=45858&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch Mon May 13 11:39:57 2013
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.5.1~beta2~svn12051/Mesh/Field.cpp
+Index: gmsh-tetgen-2.7.1~svn15527/Mesh/Field.cpp
===================================================================
---- gmsh-tetgen-2.5.1~beta2~svn12051.orig/Mesh/Field.cpp 2012-05-10 21:50:05.000000000 +0200
-+++ gmsh-tetgen-2.5.1~beta2~svn12051/Mesh/Field.cpp 2012-05-10 21:53:21.439618616 +0200
-@@ -467,6 +467,55 @@
+--- gmsh-tetgen-2.7.1~svn15527.orig/Mesh/Field.cpp 2013-05-13 13:10:12.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/Mesh/Field.cpp 2013-05-13 13:10:17.000000000 +0200
+@@ -531,6 +531,55 @@
}
};
@@ -58,7 +58,7 @@
class FrustumField : public Field
{
double x1,y1,z1;
-@@ -1268,17 +1317,21 @@
+@@ -1332,17 +1381,21 @@
}
virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
{
@@ -80,7 +80,7 @@
}
v = intersection_conserve_mostaniso(v,ff);
}
-@@ -1316,6 +1369,77 @@
+@@ -1380,6 +1433,77 @@
}
};
@@ -158,7 +158,7 @@
class MinField : public Field
{
std::list<int> idlist;
-@@ -1334,7 +1458,18 @@
+@@ -1398,7 +1522,18 @@
double v = MAX_LC;
for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
Field *f = (GModel::current()->getFields()->get(*it));
@@ -178,7 +178,7 @@
}
return v;
}
-@@ -1362,7 +1497,18 @@
+@@ -1426,7 +1561,18 @@
double v = -MAX_LC;
for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
Field *f = (GModel::current()->getFields()->get(*it));
@@ -198,15 +198,15 @@
}
return v;
}
-@@ -2017,6 +2163,7 @@
+@@ -2112,6 +2258,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>();
- #if defined(HAVE_POST)
-@@ -2026,6 +2173,7 @@
+ map_type_name["XY2d2LonLat"] = new FieldFactoryT<XY2d2LonLatField>();
+@@ -2122,6 +2269,7 @@
map_type_name["Restrict"] = new FieldFactoryT<RestrictField>();
map_type_name["Min"] = new FieldFactoryT<MinField>();
map_type_name["MinAniso"] = new FieldFactoryT<MinAnisoField>();
@@ -214,11 +214,11 @@
map_type_name["Max"] = new FieldFactoryT<MaxField>();
map_type_name["UTM"] = new FieldFactoryT<UTMField>();
map_type_name["Laplacian"] = new FieldFactoryT<LaplacianField>();
-Index: gmsh-tetgen-2.5.1~beta2~svn12051/Geo/STensor3.h
+Index: gmsh-tetgen-2.7.1~svn15527/Geo/STensor3.h
===================================================================
---- gmsh-tetgen-2.5.1~beta2~svn12051.orig/Geo/STensor3.h 2012-05-10 21:50:43.000000000 +0200
-+++ gmsh-tetgen-2.5.1~beta2~svn12051/Geo/STensor3.h 2012-05-10 21:53:21.439618616 +0200
-@@ -171,6 +171,8 @@
+--- gmsh-tetgen-2.7.1~svn15527.orig/Geo/STensor3.h 2013-05-13 13:10:12.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/Geo/STensor3.h 2013-05-13 13:10:17.000000000 +0200
+@@ -173,6 +173,8 @@
// compute the largest inscribed ellipsoid...
SMetric3 intersection (const SMetric3 &m1,
const SMetric3 &m2);
@@ -227,11 +227,11 @@
SMetric3 interpolation (const SMetric3 &m1,
const SMetric3 &m2,
const double t);
-Index: gmsh-tetgen-2.5.1~beta2~svn12051/Geo/STensor3.cpp
+Index: gmsh-tetgen-2.7.1~svn15527/Geo/STensor3.cpp
===================================================================
---- gmsh-tetgen-2.5.1~beta2~svn12051.orig/Geo/STensor3.cpp 2012-05-10 21:50:43.000000000 +0200
-+++ gmsh-tetgen-2.5.1~beta2~svn12051/Geo/STensor3.cpp 2012-05-10 21:53:21.439618616 +0200
-@@ -82,6 +82,27 @@
+--- gmsh-tetgen-2.7.1~svn15527.orig/Geo/STensor3.cpp 2013-05-13 13:10:12.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/Geo/STensor3.cpp 2013-05-13 13:10:17.000000000 +0200
+@@ -48,6 +48,27 @@
return iv;
}
Modified: packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch?rev=45858&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch Mon May 13 11:39:57 2013
@@ -2,8 +2,10 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
---- a/wrappers/java/CMakeLists.txt
-+++ b/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.7.1~svn15527/wrappers/java/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.7.1~svn15527.orig/wrappers/java/CMakeLists.txt 2013-05-13 13:06:19.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/wrappers/java/CMakeLists.txt 2013-05-13 13:06:22.000000000 +0200
@@ -34,7 +34,11 @@
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
@@ -17,9 +19,11 @@
endif(UNIX)
add_custom_command(TARGET WrapGmsh
POST_BUILD # do the rest of the command after the build period
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1048,7 +1048,7 @@
+Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt 2013-05-13 13:06:19.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt 2013-05-13 13:06:22.000000000 +0200
+@@ -1111,7 +1111,7 @@
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -28,15 +32,16 @@
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1060,10 +1060,10 @@
- # shared library target
- if(ENABLE_BUILD_SHARED OR ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
+@@ -1124,10 +1124,10 @@
+ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
+ ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
add_library(shared SHARED ${GMSH_SRC})
- set_target_properties(shared PROPERTIES OUTPUT_NAME Gmsh)
+ set_target_properties(shared PROPERTIES OUTPUT_NAME gmsh)
set_target_properties(shared PROPERTIES
- VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
-- SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
+- VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
+- SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
++ VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
+ SOVERSION ${GMSH_MAJOR_VERSION})
if(HAVE_LAPACK AND LAPACK_FLAGS)
set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
Modified: packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch?rev=45858&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch Mon May 13 11:39:57 2013
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.6.2~svn13116/Graphics/CMakeLists.txt
+Index: gmsh-tetgen-2.7.1~svn15527/Graphics/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.6.2~svn13116.orig/Graphics/CMakeLists.txt 2012-09-05 11:08:46.000000000 +0200
-+++ gmsh-tetgen-2.6.2~svn13116/Graphics/CMakeLists.txt 2012-09-05 11:18:48.000000000 +0200
+--- gmsh-tetgen-2.7.1~svn15527.orig/Graphics/CMakeLists.txt 2013-05-13 12:46:34.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/Graphics/CMakeLists.txt 2013-05-13 13:06:41.000000000 +0200
@@ -15,7 +15,6 @@
drawScales.cpp
drawGraph2d.cpp
@@ -14,16 +14,16 @@
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-tetgen-2.6.2~svn13116/CMakeLists.txt
+Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.6.2~svn13116.orig/CMakeLists.txt 2012-09-05 11:18:36.000000000 +0200
-+++ gmsh-tetgen-2.6.2~svn13116/CMakeLists.txt 2012-09-05 11:18:48.000000000 +0200
-@@ -1071,7 +1071,7 @@
- add_executable(gmsh_dynamic EXCLUDE_FROM_ALL Common/Main.cpp)
- target_link_libraries(gmsh_dynamic shared)
+--- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt 2013-05-13 13:06:29.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt 2013-05-13 13:06:41.000000000 +0200
+@@ -1158,7 +1158,7 @@
+ add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
+ endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
-target_link_libraries(gmsh ${LINK_LIBRARIES})
+target_link_libraries(gmsh ${LINK_LIBRARIES} -lgl2ps -lGL -lglut)
- # increase stack to 16Mb on Windows to avoid overflows in recursive
- # tet classification for large 3D Delaunay grids + force static
+ # Windows specific linker options
+ if(WIN32 AND NOT MSVC OR CYGWIN)
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch?rev=45858&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch Mon May 13 11:39:57 2013
@@ -4,12 +4,12 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1071,7 +1071,7 @@
+@@ -1151,7 +1151,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)
- target_link_libraries(shared ${LINK_LIBRARIES})
+ target_link_libraries(shared ${LINK_LIBRARIES} -shared -lgl2ps -lGL -lglut)
- endif(ENABLE_BUILD_SHARED OR ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
+ endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
+ ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
- # binary targets
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch?rev=45858&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch Mon May 13 11:39:57 2013
@@ -2,25 +2,6 @@
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1255,13 +1255,13 @@
- # (e.g. "make lib" or "make shared" followed by "make install/fast")
- install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
- if(ENABLE_BUILD_LIB)
-- install(TARGETS lib DESTINATION lib OPTIONAL)
-+ install(TARGETS lib DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
- endif(ENABLE_BUILD_LIB)
- if(ENABLE_BUILD_SHARED)
-- install(TARGETS shared DESTINATION lib OPTIONAL)
-+ install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
- endif(ENABLE_BUILD_SHARED)
- if(ENABLE_BUILD_ANDROID)
-- install(TARGETS androidGmsh DESTINATION lib OPTIONAL)
-+ install(TARGETS androidGmsh DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
- endif(ENABLE_BUILD_ANDROID)
-
- install(FILES ${GMSH_API} DESTINATION include/gmsh)
--- a/wrappers/java/CMakeLists.txt
+++ b/wrappers/java/CMakeLists.txt
@@ -73,6 +73,6 @@
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch?rev=45858&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch Mon May 13 11:39:57 2013
@@ -2,8 +2,10 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
---- a/Plugin/Bubbles.cpp
-+++ b/Plugin/Bubbles.cpp
+Index: gmsh-tetgen-2.7.1~svn15527/Plugin/Bubbles.cpp
+===================================================================
+--- gmsh-tetgen-2.7.1~svn15527.orig/Plugin/Bubbles.cpp 2013-05-13 12:46:25.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/Plugin/Bubbles.cpp 2013-05-13 13:06:35.000000000 +0200
@@ -30,7 +30,7 @@
{
return "Plugin(Bubbles) constructs a geometry consisting of "
@@ -13,8 +15,10 @@
"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
+Index: gmsh-tetgen-2.7.1~svn15527/contrib/lbfgs/alglibinternal.cpp
+===================================================================
+--- gmsh-tetgen-2.7.1~svn15527.orig/contrib/lbfgs/alglibinternal.cpp 2013-05-13 12:46:28.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/contrib/lbfgs/alglibinternal.cpp 2013-05-13 13:06:35.000000000 +0200
@@ -3679,8 +3679,8 @@
{
return;
@@ -37,9 +41,11 @@
/*
* beta*y
---- a/doc/texinfo/gmsh.texi
-+++ b/doc/texinfo/gmsh.texi
-@@ -1398,7 +1398,7 @@
+Index: gmsh-tetgen-2.7.1~svn15527/doc/texinfo/gmsh.texi
+===================================================================
+--- gmsh-tetgen-2.7.1~svn15527.orig/doc/texinfo/gmsh.texi 2013-05-13 12:46:40.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/doc/texinfo/gmsh.texi 2013-05-13 13:06:35.000000000 +0200
+@@ -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
@@ -48,7 +54,7 @@
@w{@var{char-option}s} are listed in @ref{Options}.
Character expressions are mostly used to specify non-numeric options and
-@@ -2922,7 +2922,7 @@
+@@ -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)
Modified: packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch?rev=45858&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch Mon May 13 11:39:57 2013
@@ -2,20 +2,20 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.6.2~svn13116/CMakeLists.txt
+Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.6.2~svn13116.orig/CMakeLists.txt 2012-09-05 11:18:34.000000000 +0200
-+++ gmsh-tetgen-2.6.2~svn13116/CMakeLists.txt 2012-09-05 11:18:36.000000000 +0200
-@@ -1114,7 +1114,7 @@
+--- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt 2013-05-13 13:06:22.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt 2013-05-13 13:06:29.000000000 +0200
+@@ -1207,7 +1207,7 @@
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
-set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/LICENSE.txt)
+#set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/LICENSE.txt)
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/?*.*)
- file(GLOB DEMO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/demos/?*.*)
-@@ -1214,7 +1214,7 @@
+@@ -1332,7 +1332,7 @@
if(MAKEINFO AND TEXI2PDF)
add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf
${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
Modified: packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch?rev=45858&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch Mon May 13 11:39:57 2013
@@ -4,11 +4,11 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-02-10
-Index: gmsh-tetgen-2.6.2~svn13116/CMakeLists.txt
+Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.6.2~svn13116.orig/CMakeLists.txt 2012-09-05 11:18:48.000000000 +0200
-+++ gmsh-tetgen-2.6.2~svn13116/CMakeLists.txt 2012-09-05 11:18:56.000000000 +0200
-@@ -824,15 +824,6 @@
+--- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt 2013-05-13 13:06:41.000000000 +0200
++++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt 2013-05-13 13:06:47.000000000 +0200
+@@ -890,15 +890,6 @@
endif(HAVE_SOLVER)
if(ENABLE_OCC)
@@ -24,7 +24,7 @@
set(OCC_LIBS_REQUIRED
# subset of DataExchange
TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -843,6 +834,30 @@
+@@ -909,6 +900,30 @@
TKBRep TKGeomBase TKG3d TKG2d
# FoundationClasses
TKAdvTools TKMath TKernel)
@@ -55,7 +55,7 @@
list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
set(OCC_LIBS)
foreach(OCC ${OCC_LIBS_REQUIRED})
-@@ -878,6 +893,7 @@
+@@ -944,6 +959,7 @@
endif(NOT OCC_CONFIG_H)
endif(OCC_INC)
endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
More information about the debian-science-commits
mailing list