r46741 - /packages/gmsh-tetgen/trunk/debian/patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Tue Jun 24 12:15:38 UTC 2014
Author: trophime-guest
Date: Tue Jun 24 12:15:38 2014
New Revision: 46741
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46741
Log:
update patches for rev 18982
Modified:
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_script_header.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch
packages/gmsh-tetgen/trunk/debian/patches/netgen.patch
packages/gmsh-tetgen/trunk/debian/patches/series
packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch
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=46741&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch Tue Jun 24 12:15:38 2014
@@ -3,19 +3,19 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-06-24
-Index: gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/CMakeLists.txt 2014-04-16 08:21:12.921875080 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt 2014-04-16 08:21:12.917874897 +0200
-@@ -104,6 +104,7 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+@@ -105,6 +105,7 @@ set(GMSH_API
Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h
Common/OS.h Common/StringUtils.h Common/OpenFile.h
Common/onelab.h Common/GmshSocket.h Common/onelabUtils.h
+ Common/Options.h
Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
- Numeric/JacobianBasis.h Numeric/bezierBasis.h Numeric/fullMatrix.h
+ Numeric/JacobianBasis.h Numeric/MetricBasis.h Numeric/bezierBasis.h Numeric/fullMatrix.h
Numeric/simpleFunction.h Numeric/cartesian.h Numeric/ElementType.h
-@@ -123,6 +124,7 @@
+@@ -124,6 +125,7 @@ set(GMSH_API
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/meshMetric.h
@@ -23,7 +23,7 @@
Numeric/mathEvaluator.h
Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
Solver/crossConfTerm.h Solver/orthogonalTerm.h
-@@ -133,6 +135,7 @@
+@@ -134,6 +136,7 @@ set(GMSH_API
Post/PViewDataList.h Post/PViewDataGModel.h Post/PViewOptions.h Post/ColorTable.h
Numeric/nodalBasis.h
Graphics/drawContext.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=46741&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch Tue Jun 24 12:15:38 2014
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.8.5~svn18353/Mesh/Field.cpp
+Index: gmsh-tetgen-2.8.5~svn18982/Mesh/Field.cpp
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/Mesh/Field.cpp 2014-04-16 08:21:06.665590465 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/Mesh/Field.cpp 2014-04-16 08:21:06.665590465 +0200
-@@ -485,6 +485,55 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/Mesh/Field.cpp
++++ gmsh-tetgen-2.8.5~svn18982/Mesh/Field.cpp
+@@ -534,6 +534,55 @@ class SphereField : public Field
}
};
@@ -58,7 +58,7 @@
class FrustumField : public Field
{
double x1,y1,z1;
-@@ -1289,17 +1338,21 @@
+@@ -1340,17 +1389,21 @@ class MinAnisoField : public Field
}
virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
{
@@ -80,10 +80,19 @@
}
v = intersection_conserve_mostaniso(v,ff);
}
-@@ -1337,6 +1390,77 @@
- }
- };
-
+@@ -1449,6 +1502,77 @@ class IntersectAnisoField : public Field
+ }
+ fullMatrix<double> V(3,3);
+ fullVector<double> S(3);
++ metr.eig(V, S, 1);
++ return sqrt(1./S(2)); //S(2) is largest eigenvalue
++ }
++ const char *getName()
++ {
++ return "IntersectAniso";
++ }
++};
++
+class IntersectAnisoField : public Field
+{
+ std::list<int> idlist;
@@ -146,92 +155,27 @@
+ }
+ fullMatrix<double> V(3,3);
+ fullVector<double> S(3);
-+ metr.eig(V, S, 1);
-+ return sqrt(1./S(2)); //S(2) is largest eigenvalue
-+ }
-+ const char *getName()
-+ {
-+ return "IntersectAniso";
-+ }
-+};
-+
- class MinField : public Field
- {
- std::list<int> idlist;
-@@ -1355,7 +1479,18 @@
- double v = MAX_LC;
- for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
- Field *f = (GModel::current()->getFields()->get(*it));
-- if(f && *it != id) v = std::min(v, (*f) (x, y, z, ge));
-+ if(f && *it != id) {
-+ if (f->isotropic())
-+ v = std::min(v, (*f) (x, y, z, ge));
-+ else{
-+ SMetric3 ff;
-+ (*f) (x, y, z, ff, ge);
-+ fullMatrix<double> V(3,3);
-+ fullVector<double> S(3);
-+ ff.eig(V, S, 1);
-+ v = std::min(v, sqrt(1./S(2))); //S(2) is largest eigenvalue
-+ }
-+ }
- }
- return v;
+ metr.eig(V, S, 1);
+ return sqrt(1./S(2)); //S(2) is largest eigenvalue
}
-@@ -1383,7 +1518,18 @@
- double v = -MAX_LC;
- for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
- Field *f = (GModel::current()->getFields()->get(*it));
-- if(f && *it != id) v = std::max(v, (*f) (x, y, z, ge));
-+ if(f && *it != id) {
-+ if (f->isotropic())
-+ v = std::max(v, (*f) (x, y, z, ge));
-+ else{
-+ SMetric3 ff;
-+ (*f) (x, y, z, ff, ge);
-+ fullMatrix<double> V(3,3);
-+ fullVector<double> S(3);
-+ ff.eig(V, S, 1);
-+ v = std::max(v, sqrt(1./S(0))); //S(0) is smallest eigenvalue
-+ }
-+ }
- }
- return v;
- }
-@@ -2157,6 +2303,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)
-@@ -2166,6 +2313,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["Laplacian"] = new FieldFactoryT<LaplacianField>();
- map_type_name["Mean"] = new FieldFactoryT<MeanField>();
-Index: gmsh-tetgen-2.8.5~svn18353/Geo/STensor3.h
+Index: gmsh-tetgen-2.8.5~svn18982/Geo/STensor3.h
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/Geo/STensor3.h 2014-04-16 08:21:06.665590465 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/Geo/STensor3.h 2014-04-16 08:21:06.665590465 +0200
-@@ -173,6 +173,8 @@
- // compute the largest inscribed ellipsoid...
- SMetric3 intersection (const SMetric3 &m1,
+--- gmsh-tetgen-2.8.5~svn18982.orig/Geo/STensor3.h
++++ gmsh-tetgen-2.8.5~svn18982/Geo/STensor3.h
+@@ -175,6 +175,8 @@ SMetric3 intersection (const SMetric3 &m
+ const SMetric3 &m2);
+ SMetric3 intersection_alauzet (const SMetric3 &m1,
const SMetric3 &m2);
+SMetric3 intersection_alauzet (const SMetric3 &m1,
+ const SMetric3 &m2);
SMetric3 interpolation (const SMetric3 &m1,
const SMetric3 &m2,
const double t);
-Index: gmsh-tetgen-2.8.5~svn18353/Geo/STensor3.cpp
+Index: gmsh-tetgen-2.8.5~svn18982/Geo/STensor3.cpp
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/Geo/STensor3.cpp 2014-04-16 08:21:06.665590465 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/Geo/STensor3.cpp 2014-04-16 08:21:06.665590465 +0200
-@@ -48,6 +48,27 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/Geo/STensor3.cpp
++++ gmsh-tetgen-2.8.5~svn18982/Geo/STensor3.cpp
+@@ -69,6 +69,27 @@ SMetric3 intersection_alauzet (const SMe
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=46741&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 Tue Jun 24 12:15:38 2014
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
-Index: gmsh-tetgen-2.8.5~svn18353/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/wrappers/java/CMakeLists.txt 2014-04-16 08:21:48.463491999 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/wrappers/java/CMakeLists.txt 2014-04-16 08:21:48.459491817 +0200
-@@ -34,7 +34,11 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/wrappers/java/CMakeLists.txt
+@@ -34,7 +34,11 @@ if(WIN32)
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
if(UNIX)
@@ -19,11 +19,11 @@
endif(UNIX)
add_custom_command(TARGET WrapGmsh
POST_BUILD # do the rest of the command after the build period
-Index: gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/CMakeLists.txt 2014-04-16 08:21:48.463491999 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt 2014-04-16 08:21:48.459491817 +0200
-@@ -1273,7 +1273,7 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+@@ -1286,7 +1286,7 @@ endforeach(DIR)
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +32,7 @@
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1300,10 +1300,10 @@
+@@ -1313,10 +1313,10 @@ endif(ENABLE_BUILD_ANDROID)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
add_library(shared SHARED ${GMSH_SRC})
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=46741&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 Tue Jun 24 12:15:38 2014
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.8.5~svn18353/Graphics/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/Graphics/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/Graphics/CMakeLists.txt 2014-04-16 08:20:49.200795960 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/Graphics/CMakeLists.txt 2014-04-16 08:20:49.196795779 +0200
-@@ -15,7 +15,6 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/Graphics/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/Graphics/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SRC
drawScales.cpp
drawGraph2d.cpp
drawGlyph.cpp
@@ -14,11 +14,11 @@
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/CMakeLists.txt 2014-04-16 08:20:49.200795960 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt 2014-04-16 08:20:49.196795779 +0200
-@@ -1334,7 +1334,7 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+@@ -1347,7 +1347,7 @@ else(HAVE_FLTK)
add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
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=46741&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch Tue Jun 24 12:15:38 2014
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-04-08
-Index: gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/CMakeLists.txt 2014-04-16 08:20:57.253162275 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt 2014-04-16 08:20:57.249162093 +0200
-@@ -1311,7 +1311,7 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+@@ -1324,7 +1324,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
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)
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=46741&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch Tue Jun 24 12:15:38 2014
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
-Index: gmsh-tetgen-2.8.5~svn18353/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/wrappers/java/CMakeLists.txt 2014-04-16 08:21:21.886282896 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/wrappers/java/CMakeLists.txt 2014-04-16 08:21:21.882282715 +0200
-@@ -73,6 +73,6 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/wrappers/java/CMakeLists.txt
+@@ -73,6 +73,6 @@ POST_BUILD # do the rest of the command
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml
${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/)
@@ -15,11 +15,11 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/CMakeLists.txt 2014-04-16 08:21:21.886282896 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt 2014-04-16 08:21:21.886282896 +0200
-@@ -1454,7 +1454,7 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+@@ -1468,7 +1468,7 @@ endif(WIN32 OR CYGWIN)
# (e.g. "make lib" or "make shared" followed by "make install/fast")
install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
if(ENABLE_BUILD_LIB)
@@ -28,7 +28,7 @@
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1490,7 +1490,7 @@
+@@ -1504,7 +1504,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
install(FILES ${GCC_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
endif(GCC_DLL AND STDC_DLL)
else(WIN32 AND NOT MSVC OR CYGWIN)
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch?rev=46741&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch Tue Jun 24 12:15:38 2014
@@ -2,12 +2,12 @@
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-05-12
-Index: gmsh-tetgen-2.8.4~svn16803/contrib/onelab/python/onelab.py
+Index: gmsh-tetgen-2.8.5~svn18982/contrib/onelab/python/onelab.py
===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/contrib/onelab/python/onelab.py 2013-09-28 09:38:02.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/contrib/onelab/python/onelab.py 2013-09-28 09:38:02.000000000 +0200
+--- gmsh-tetgen-2.8.5~svn18982.orig/contrib/onelab/python/onelab.py
++++ gmsh-tetgen-2.8.5~svn18982/contrib/onelab/python/onelab.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
"""
- OneLab - Copyright (C) 2011-2013 ULg-UCL
+ OneLab - Copyright (C) 2011-2014 ULg-UCL
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=46741&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch Tue Jun 24 12:15:38 2014
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.8.5~svn18353/Plugin/Bubbles.cpp
+Index: gmsh-tetgen-2.8.5~svn18982/Plugin/Bubbles.cpp
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/Plugin/Bubbles.cpp 2014-04-16 08:20:23.659634078 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/Plugin/Bubbles.cpp 2014-04-16 08:20:23.655633895 +0200
-@@ -31,7 +31,7 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/Plugin/Bubbles.cpp
++++ gmsh-tetgen-2.8.5~svn18982/Plugin/Bubbles.cpp
+@@ -31,7 +31,7 @@ std::string GMSH_BubblesPlugin::getHelp(
{
return "Plugin(Bubbles) constructs a geometry consisting of "
"`bubbles' inscribed in the Voronoi of an input triangulation. "
@@ -15,11 +15,11 @@
"The plugin expects a triangulation in the `z = 0' plane to exist "
"in the current model.\n\n"
"Plugin(Bubbles) creates one `.geo' file.";
-Index: gmsh-tetgen-2.8.5~svn18353/contrib/lbfgs/alglibinternal.cpp
+Index: gmsh-tetgen-2.8.5~svn18982/contrib/lbfgs/alglibinternal.cpp
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/contrib/lbfgs/alglibinternal.cpp 2014-04-16 08:20:23.659634078 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/contrib/lbfgs/alglibinternal.cpp 2014-04-16 08:20:23.655633895 +0200
-@@ -3679,8 +3679,8 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/contrib/lbfgs/alglibinternal.cpp
++++ gmsh-tetgen-2.8.5~svn18982/contrib/lbfgs/alglibinternal.cpp
+@@ -3679,8 +3679,8 @@ void matrixvectormultiply(/* Real */
{
return;
}
@@ -30,7 +30,7 @@
/*
* beta*y
-@@ -3716,8 +3716,8 @@
+@@ -3716,8 +3716,8 @@ void matrixvectormultiply(/* Real */
{
return;
}
@@ -41,20 +41,20 @@
/*
* beta*y
-Index: gmsh-tetgen-2.8.5~svn18353/doc/texinfo/gmsh.texi
+Index: gmsh-tetgen-2.8.5~svn18982/doc/texinfo/gmsh.texi
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/doc/texinfo/gmsh.texi 2014-04-16 08:20:23.659634078 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/doc/texinfo/gmsh.texi 2014-04-16 08:20:23.655633895 +0200
-@@ -1022,7 +1022,7 @@
- exists (i.e., has been defined previously), and @code{FileExists} checks
- if the file with the given name exists.
+--- gmsh-tetgen-2.8.5~svn18982.orig/doc/texinfo/gmsh.texi
++++ gmsh-tetgen-2.8.5~svn18982/doc/texinfo/gmsh.texi
+@@ -1029,7 +1029,7 @@ is followed by the various ONELAB option
+ @uref{http://onelab.info/wiki/ONELAB_Syntax_for_Gmsh_and_GetDP} for more
+ information.
-The last case in the definition allows to ask the user for a value
+The last case in the definition allows one to ask the user for a value
interactively. For example, inserting @code{GetValue("Value of parameter
alpha?", 5.76)} in an input file will query the user for the value of a
certain parameter alpha, assuming the default value is 5.76. If the
-@@ -1121,7 +1121,7 @@
+@@ -1129,7 +1129,7 @@ function (where @var{char-expression} is
contain floating point formatting characters: @code{%e}, @code{%g},
etc.) The various @w{@var{char-option}s} are listed in
@ref{Options}. @code{GetEnvThe} gets the value of an environment
@@ -63,7 +63,7 @@
user for a value interactively. @code{StrReplace}'s arguments are: input
string, old substring, new substring. at footnote{For compatibility with GetDP
(@uref{http://geuz.org/getdp/}), parentheses can be replaced by brackets
-@@ -2740,7 +2740,7 @@
+@@ -2764,7 +2764,7 @@ above.
@item Extrude @{ Surface @{ @var{expression-list} @}; @var{layers} < Using Index[@var{expr}]; > < Using View[@var{expr}]; > < ScaleLastLayer; > @}
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/netgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/netgen.patch?rev=46741&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/netgen.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/netgen.patch Tue Jun 24 12:15:38 2014
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/CMakeLists.txt 2014-04-16 08:21:29.426625932 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt 2014-04-16 08:21:29.426625932 +0200
-@@ -707,10 +707,36 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+@@ -714,10 +714,36 @@ if(HAVE_MESH)
endif(ENABLE_BLOSSOM)
if(ENABLE_NETGEN)
@@ -41,7 +41,7 @@
add_definitions(-DNO_PARALLEL_THREADS -DNOTCL)
endif(ENABLE_NETGEN)
-@@ -1049,8 +1075,13 @@
+@@ -1062,8 +1088,13 @@ if(ENABLE_OCC)
add_definitions(-DSGEOMGEOMETRY)
set_config_option(HAVE_SGEOM "SGEOM")
elseif(ENABLE_SALOME)
@@ -57,10 +57,10 @@
add_definitions(-DOCCGEOMETRY)
set_config_option(HAVE_SALOME "Salome")
endif(ENABLE_SGEOM)
-Index: gmsh-tetgen-2.8.5~svn18353/contrib/Netgen/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/contrib/Netgen/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/contrib/Netgen/CMakeLists.txt 2014-04-16 08:21:29.426625932 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/contrib/Netgen/CMakeLists.txt 2014-04-16 08:21:29.426625932 +0200
+--- gmsh-tetgen-2.8.5~svn18982.orig/contrib/Netgen/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/contrib/Netgen/CMakeLists.txt
@@ -3,38 +3,42 @@
# See the LICENSE.txt file for license information. Please report all
# bugs and problems to the public mailing list <gmsh at geuz.org>.
Modified: packages/gmsh-tetgen/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/series?rev=46741&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/series (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/series Tue Jun 24 12:15:38 2014
@@ -1,6 +1,6 @@
change_shared_library_name.patch
skip_license_file.patch
-#fix_spelling_errors.patch
+fix_spelling_errors.patch
delete_gl2ps_from_source.patch
#switch_from_opencascade_to_oce.patch
api_demos.patch
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=46741&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch Tue Jun 24 12:15:38 2014
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/CMakeLists.txt 2014-04-16 08:21:54.335759157 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt 2014-04-16 08:21:54.331758975 +0200
-@@ -1384,7 +1384,7 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+@@ -1398,7 +1398,7 @@ if(UNIX)
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,7 +15,7 @@
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/?*.*)
-@@ -1548,7 +1548,7 @@
+@@ -1564,7 +1564,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
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/tetgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch?rev=46741&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch Tue Jun 24 12:15:38 2014
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18353.orig/CMakeLists.txt 2014-04-16 08:21:35.306893448 +0200
-+++ gmsh-tetgen-2.8.5~svn18353/CMakeLists.txt 2014-04-16 08:21:35.302893266 +0200
-@@ -760,29 +760,30 @@
+--- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+@@ -767,29 +767,30 @@ if(HAVE_MESH)
set_config_option(HAVE_MMG3D "Mmg3d")
endif(ENABLE_MMG3D)
More information about the debian-science-commits
mailing list