r45940 - in /packages/gmsh-tetgen/trunk/debian/patches: alauzet.patch fix_libdir.patch
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Sun May 19 14:19:12 UTC 2013
Author: trophime-guest
Date: Sun May 19 14:19:11 2013
New Revision: 45940
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45940
Log:
update patches for rev >= 15595
Modified:
packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.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=45940&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch Sun May 19 14:19:11 2013
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.7.1~svn15527/Mesh/Field.cpp
+Index: gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016/Mesh/Field.cpp
===================================================================
---- 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 @@
+--- gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016.orig/Mesh/Field.cpp 2013-05-19 13:58:53.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016/Mesh/Field.cpp 2013-05-19 16:09:03.000000000 +0200
+@@ -480,6 +480,55 @@
}
};
@@ -58,7 +58,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)
{
@@ -80,7 +80,7 @@
}
v = intersection_conserve_mostaniso(v,ff);
}
-@@ -1380,6 +1433,77 @@
+@@ -1329,6 +1382,77 @@
}
};
@@ -158,7 +158,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));
@@ -178,7 +178,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));
@@ -198,26 +198,26 @@
}
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>();
-Index: gmsh-tetgen-2.7.1~svn15527/Geo/STensor3.h
+ map_type_name["Mean"] = new FieldFactoryT<MeanField>();
+Index: gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016/Geo/STensor3.h
===================================================================
---- 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
+--- gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016.orig/Geo/STensor3.h 2013-05-19 13:58:58.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016/Geo/STensor3.h 2013-05-19 16:09:03.000000000 +0200
@@ -173,6 +173,8 @@
// compute the largest inscribed ellipsoid...
SMetric3 intersection (const SMetric3 &m1,
@@ -227,10 +227,10 @@
SMetric3 interpolation (const SMetric3 &m1,
const SMetric3 &m2,
const double t);
-Index: gmsh-tetgen-2.7.1~svn15527/Geo/STensor3.cpp
+Index: gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016/Geo/STensor3.cpp
===================================================================
---- 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
+--- gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016.orig/Geo/STensor3.cpp 2013-05-19 13:58:58.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016/Geo/STensor3.cpp 2013-05-19 16:09:03.000000000 +0200
@@ -48,6 +48,27 @@
return iv;
}
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=45940&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch Sun May 19 14:19:11 2013
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
-Index: gmsh-tetgen-2.7.1~svn15527/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.7.1~svn15527.orig/wrappers/java/CMakeLists.txt 2013-05-13 14:36:11.000000000 +0200
-+++ gmsh-tetgen-2.7.1~svn15527/wrappers/java/CMakeLists.txt 2013-05-13 14:36:11.000000000 +0200
+--- gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016.orig/wrappers/java/CMakeLists.txt 2013-05-19 16:09:47.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15595.obsolete.0.556445652227016/wrappers/java/CMakeLists.txt 2013-05-19 16:09:47.000000000 +0200
@@ -73,6 +73,6 @@
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml
@@ -15,20 +15,3 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
-===================================================================
---- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt 2013-05-13 14:36:11.000000000 +0200
-+++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt 2013-05-13 14:36:41.000000000 +0200
-@@ -1294,10 +1294,10 @@
- # (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 ${GMSH_LIB} OPTIONAL)
-+ 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)
- endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
-
- install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN})
More information about the debian-science-commits
mailing list