r44763 - /packages/gmsh-tetgen/trunk/debian/patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Fri May 11 10:47:09 UTC 2012
Author: trophime-guest
Date: Fri May 11 10:47:09 2012
New Revision: 44763
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44763
Log:
update patches
Modified:
packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch
packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch
packages/gmsh-tetgen/trunk/debian/patches/cgns.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_spelling_errors.patch
packages/gmsh-tetgen/trunk/debian/patches/metis.patch
packages/gmsh-tetgen/trunk/debian/patches/pedantic.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/patches/Alauzet.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch?rev=44763&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch Fri May 11 10:47:09 2012
@@ -1,7 +1,7 @@
-Index: gmsh-2.5.1~beta2~svn11871~dfsg/Mesh/BackgroundMesh.cpp
-===================================================================
---- gmsh-2.5.1~beta2~svn11871~dfsg.orig/Mesh/BackgroundMesh.cpp (révision 11871)
-+++ gmsh-2.5.1~beta2~svn11871~dfsg/Mesh/BackgroundMesh.cpp (copie de travail)
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/Mesh/BackgroundMesh.cpp
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/Mesh/BackgroundMesh.cpp 2012-05-10 21:50:05.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/Mesh/BackgroundMesh.cpp 2012-05-10 21:53:21.435618616 +0200
@@ -397,6 +397,7 @@
double U, double V,
double X, double Y, double Z)
@@ -35,10 +35,10 @@
{
fullMatrix<double> V(3,3);
fullVector<double> S(3);
-Index: gmsh-2.5.1~beta2~svn11871~dfsg/Mesh/Field.cpp
-===================================================================
---- gmsh-2.5.1~beta2~svn11871~dfsg.orig/Mesh/Field.cpp (révision 11871)
-+++ gmsh-2.5.1~beta2~svn11871~dfsg/Mesh/Field.cpp (copie de travail)
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/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 @@
}
};
@@ -235,7 +235,7 @@
}
return v;
}
-@@ -2011,6 +2157,7 @@
+@@ -2017,6 +2163,7 @@
#endif
map_type_name["Box"] = new FieldFactoryT<BoxField>();
map_type_name["Cylinder"] = new FieldFactoryT<CylinderField>();
@@ -243,7 +243,7 @@
map_type_name["Frustum"] = new FieldFactoryT<FrustumField>();
map_type_name["LonLat"] = new FieldFactoryT<LonLatField>();
#if defined(HAVE_POST)
-@@ -2020,6 +2167,7 @@
+@@ -2026,6 +2173,7 @@
map_type_name["Restrict"] = new FieldFactoryT<RestrictField>();
map_type_name["Min"] = new FieldFactoryT<MinField>();
map_type_name["MinAniso"] = new FieldFactoryT<MinAnisoField>();
@@ -251,10 +251,10 @@
map_type_name["Max"] = new FieldFactoryT<MaxField>();
map_type_name["UTM"] = new FieldFactoryT<UTMField>();
map_type_name["Laplacian"] = new FieldFactoryT<LaplacianField>();
-Index: gmsh-2.5.1~beta2~svn11871~dfsg/Geo/STensor3.h
-===================================================================
---- gmsh-2.5.1~beta2~svn11871~dfsg.orig/Geo/STensor3.h (révision 11871)
-+++ gmsh-2.5.1~beta2~svn11871~dfsg/Geo/STensor3.h (copie de travail)
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/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 @@
// compute the largest inscribed ellipsoid...
SMetric3 intersection (const SMetric3 &m1,
@@ -264,10 +264,10 @@
SMetric3 interpolation (const SMetric3 &m1,
const SMetric3 &m2,
const double t);
-Index: gmsh-2.5.1~beta2~svn11871~dfsg/Geo/STensor3.cpp
-===================================================================
---- gmsh-2.5.1~beta2~svn11871~dfsg.orig/Geo/STensor3.cpp (révision 11871)
-+++ gmsh-2.5.1~beta2~svn11871~dfsg/Geo/STensor3.cpp (copie de travail)
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/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
@@ -38,6 +38,27 @@
return iv;
}
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=44763&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch Fri May 11 10:47:09 2012
@@ -1,8 +1,8 @@
-Index: gmsh-2.5.1~beta2~svn11641~dfsg-1/CMakeLists.txt
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt
===================================================================
---- gmsh-2.5.1~beta2~svn11641~dfsg-1.orig/CMakeLists.txt 2012-03-15 10:49:38.000000000 +0100
-+++ gmsh-2.5.1~beta2~svn11641~dfsg-1/CMakeLists.txt 2012-03-15 13:20:31.000000000 +0100
-@@ -80,6 +80,7 @@
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/CMakeLists.txt 2012-05-10 21:53:17.683618460 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt 2012-05-10 21:53:37.343619277 +0200
+@@ -82,6 +82,7 @@
${CMAKE_CURRENT_BINARY_DIR}/Common/GmshVersion.h
Common/Gmsh.h Common/Context.h Common/GmshDefines.h Common/GmshMessage.h
Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h
@@ -10,7 +10,7 @@
Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
Numeric/JacobianBasis.h Numeric/fullMatrix.h
Numeric/simpleFunction.h Numeric/cartesian.h
-@@ -95,16 +96,21 @@
+@@ -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
Geo/Homology.h Geo/Chain.h Geo/partitionEdge.h Geo/CGNSOptions.h Geo/gmshLevelset.h
Modified: packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch?rev=44763&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch Fri May 11 10:47:09 2012
@@ -3,8 +3,10 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-03-11
---- a/utils/api_demos/CMakeLists.txt
-+++ b/utils/api_demos/CMakeLists.txt
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/utils/api_demos/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/utils/api_demos/CMakeLists.txt 2012-05-10 21:50:06.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/utils/api_demos/CMakeLists.txt 2012-05-10 21:53:10.495618163 +0200
@@ -9,45 +9,691 @@
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose build type")
endif(DEFINED CMAKE_BUILD_TYPE)
@@ -714,8 +716,10 @@
-target_link_libraries(mainSimple shared)
+target_link_libraries(mainSimple ${LINK_LIBRARIES})
---- a/utils/api_demos/mainAntTweakBar.cpp
-+++ b/utils/api_demos/mainAntTweakBar.cpp
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/utils/api_demos/mainAntTweakBar.cpp
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/utils/api_demos/mainAntTweakBar.cpp 2012-05-10 21:50:06.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/utils/api_demos/mainAntTweakBar.cpp 2012-05-10 21:53:10.495618163 +0200
@@ -14,6 +14,7 @@
#include "GModel.h"
#include "MElement.h"
@@ -724,8 +728,10 @@
static drawContext *ctx = 0;
static mousePosition clickPos, prevPos;
---- a/utils/api_demos/mainCartesian.cpp
-+++ b/utils/api_demos/mainCartesian.cpp
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/utils/api_demos/mainCartesian.cpp
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/utils/api_demos/mainCartesian.cpp 2012-05-10 21:50:06.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/utils/api_demos/mainCartesian.cpp 2012-05-10 21:53:10.495618163 +0200
@@ -12,7 +12,7 @@
#include "GmshMessage.h"
#include "cartesian.h"
@@ -833,8 +839,10 @@
Msg::Info("Removing cells outside the structure");
removeOutsideCells(&box);
---- a/utils/api_demos/mainElasticity.cpp
-+++ b/utils/api_demos/mainElasticity.cpp
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/utils/api_demos/mainElasticity.cpp
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/utils/api_demos/mainElasticity.cpp 2012-05-10 21:50:06.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/utils/api_demos/mainElasticity.cpp 2012-05-10 21:53:10.495618163 +0200
@@ -3,6 +3,7 @@
#include "elasticitySolver.h"
#include "PView.h"
Modified: packages/gmsh-tetgen/trunk/debian/patches/cgns.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/cgns.patch?rev=44763&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/cgns.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/cgns.patch Fri May 11 10:47:09 2012
@@ -1,7 +1,7 @@
-Index: gmsh-2.5.1~beta2~svn11641~dfsg-1/Geo/GModelIO_CGNS.cpp
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/Geo/GModelIO_CGNS.cpp
===================================================================
---- gmsh-2.5.1~beta2~svn11641~dfsg-1.orig/Geo/GModelIO_CGNS.cpp 2012-03-15 10:35:16.000000000 +0100
-+++ gmsh-2.5.1~beta2~svn11641~dfsg-1/Geo/GModelIO_CGNS.cpp 2012-03-15 11:45:53.000000000 +0100
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/Geo/GModelIO_CGNS.cpp 2012-05-10 21:50:43.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/Geo/GModelIO_CGNS.cpp 2012-05-10 21:53:31.135619018 +0200
@@ -155,24 +155,24 @@
// 1D second-order elements
// MSH_NUM_TYPE+1 is used to place non-cgns elements last.
@@ -95,18 +95,16 @@
Msg::Debug(" [Type is double]");
coord = new double[nnodesZone];
if ( cg_coord_read(index_file, index_base, index_zone, coordName, dataType, irmin, irmax, coord)) {
-@@ -1490,8 +1490,9 @@
+@@ -1490,7 +1490,8 @@
ZoneTask() : status(0), indexInOwner(0) { }
void change_status(const int _status)
{
-#pragma omp atomic
-- status = _status;
+ //invalid pragma =
+ //#pragma omp atomic
-+ status = _status;
+ status = _status;
}
};
-
@@ -1582,7 +1583,7 @@
cgZoneSize[2] = writeZone->numBoVert; // Number of boundary vertices
if(cg_zone_write(cgIndexFile, cgIndexBase,
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=44763&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 Fri May 11 10:47:09 2012
@@ -2,9 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1006,7 +1006,7 @@
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/CMakeLists.txt 2012-05-10 21:50:43.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt 2012-05-10 21:52:48.475617250 +0200
+@@ -1017,7 +1017,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})
@@ -13,7 +15,7 @@
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1016,7 +1016,7 @@
+@@ -1027,7 +1027,7 @@
# shared library target: we don't build it by default either
add_library(shared SHARED EXCLUDE_FROM_ALL ${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=44763&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 Fri May 11 10:47:09 2012
@@ -2,8 +2,10 @@
Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
Last-Update: 2011-12-09
---- a/Graphics/CMakeLists.txt
-+++ b/Graphics/CMakeLists.txt
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/Graphics/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/Graphics/CMakeLists.txt 2012-05-10 21:50:09.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/Graphics/CMakeLists.txt 2012-05-10 21:53:04.115617897 +0200
@@ -15,7 +15,6 @@
drawScales.cpp
drawGraph2d.cpp
@@ -12,9 +14,11 @@
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1039,7 +1039,7 @@
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/CMakeLists.txt 2012-05-10 21:52:54.987617520 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt 2012-05-10 21:53:04.119617898 +0200
+@@ -1050,7 +1050,7 @@
add_executable(gmsh_dynamic EXCLUDE_FROM_ALL Common/Main.cpp)
target_link_libraries(gmsh_dynamic shared)
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=44763&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch Fri May 11 10:47:09 2012
@@ -2,9 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-04-08
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1033,7 +1033,7 @@
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/CMakeLists.txt 2012-05-10 21:53:07.231618027 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt 2012-05-10 21:53:17.683618460 +0200
+@@ -1051,7 +1051,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)
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=44763&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch Fri May 11 10:47:09 2012
@@ -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.5.1~beta2~svn12051/Plugin/Bubbles.cpp
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/Plugin/Bubbles.cpp 2012-05-10 21:50:06.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/Plugin/Bubbles.cpp 2012-05-10 21:53:00.899617764 +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.5.1~beta2~svn12051/contrib/lbfgs/alglibinternal.cpp
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/contrib/lbfgs/alglibinternal.cpp 2012-05-10 21:50:20.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/contrib/lbfgs/alglibinternal.cpp 2012-05-10 21:53:00.903617764 +0200
@@ -3679,8 +3679,8 @@
{
return;
@@ -37,8 +41,10 @@
/*
* beta*y
---- a/doc/texinfo/gmsh.texi
-+++ b/doc/texinfo/gmsh.texi
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/doc/texinfo/gmsh.texi
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/doc/texinfo/gmsh.texi 2012-05-10 21:50:40.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/doc/texinfo/gmsh.texi 2012-05-10 21:53:00.907617765 +0200
@@ -1398,7 +1398,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
Modified: packages/gmsh-tetgen/trunk/debian/patches/metis.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/metis.patch?rev=44763&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/metis.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/metis.patch Fri May 11 10:47:09 2012
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.5.1~beta2~svn11941/contrib/Metis/util.c
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/contrib/Metis/util.c
===================================================================
---- gmsh-tetgen-2.5.1~beta2~svn11941.orig/contrib/Metis/util.c 2012-04-26 13:45:22.000000000 +0200
-+++ gmsh-tetgen-2.5.1~beta2~svn11941/contrib/Metis/util.c 2012-04-26 15:55:26.000000000 +0200
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/contrib/Metis/util.c 2012-05-10 21:50:18.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/contrib/Metis/util.c 2012-05-10 21:53:40.955619426 +0200
@@ -28,7 +28,7 @@
sprintf(out2, "Error! %s", out1);
Modified: packages/gmsh-tetgen/trunk/debian/patches/pedantic.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/pedantic.patch?rev=44763&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/pedantic.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/pedantic.patch Fri May 11 10:47:09 2012
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.5.1~beta2~svn12051~dfsg-1/Geo/STensor3.h
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/Geo/STensor3.h
===================================================================
---- gmsh-tetgen-2.5.1~beta2~svn12051~dfsg-1.orig/Geo/STensor3.h 2012-05-10 21:20:00.035535643 +0200
-+++ gmsh-tetgen-2.5.1~beta2~svn12051~dfsg-1/Geo/STensor3.h 2012-05-10 21:21:04.643538322 +0200
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/Geo/STensor3.h 2012-05-10 21:53:21.439618616 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/Geo/STensor3.h 2012-05-10 21:53:27.375618862 +0200
@@ -334,7 +334,7 @@
for (int j=0; j<3; j++)
temp[i]+= t(i,j)*v[j];
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=44763&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch Fri May 11 10:47:09 2012
@@ -2,9 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1087,7 +1087,7 @@
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/CMakeLists.txt 2012-05-10 21:52:48.475617250 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt 2012-05-10 21:52:54.987617520 +0200
+@@ -1098,7 +1098,7 @@
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -13,7 +15,7 @@
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/?*.*)
-@@ -1182,7 +1182,7 @@
+@@ -1193,7 +1193,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=44763&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 Fri May 11 10:47:09 2012
@@ -4,9 +4,11 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-02-10
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -804,15 +804,6 @@
+Index: gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn12051.orig/CMakeLists.txt 2012-05-10 21:53:04.119617898 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn12051/CMakeLists.txt 2012-05-10 21:53:07.231618027 +0200
+@@ -815,15 +815,6 @@
endif(HAVE_SOLVER)
if(ENABLE_OCC)
@@ -22,7 +24,7 @@
set(OCC_LIBS_REQUIRED
# subset of DataExchange
TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -823,6 +814,30 @@
+@@ -834,6 +825,30 @@
TKBRep TKGeomBase TKG3d TKG2d
# FoundationClasses
TKAdvTools TKMath TKernel)
@@ -53,7 +55,7 @@
list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
set(OCC_LIBS)
foreach(OCC ${OCC_LIBS_REQUIRED})
-@@ -859,6 +874,7 @@
+@@ -870,6 +885,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