r46799 - /packages/gmsh-tetgen/trunk/debian/patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Wed Jul 9 09:11:54 UTC 2014
Author: trophime-guest
Date: Wed Jul 9 09:11:54 2014
New Revision: 46799
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46799
Log:
update patches for rev 19081
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/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_gmshpy_import.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/metis.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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch Wed Jul 9 09:11:54 2014
@@ -3,11 +3,11 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-06-24
-Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
-@@ -105,6 +105,7 @@ set(GMSH_API
+--- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+@@ -106,6 +106,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
@@ -15,7 +15,7 @@
Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
Numeric/JacobianBasis.h Numeric/MetricBasis.h Numeric/bezierBasis.h Numeric/fullMatrix.h
Numeric/simpleFunction.h Numeric/cartesian.h Numeric/ElementType.h
-@@ -124,6 +125,7 @@ set(GMSH_API
+@@ -125,6 +126,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
-@@ -134,6 +136,7 @@ set(GMSH_API
+@@ -135,6 +137,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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch Wed Jul 9 09:11:54 2014
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.8.5~svn18983/Mesh/Field.cpp
+Index: gmsh-tetgen-2.8.5~svn19081/Mesh/Field.cpp
===================================================================
---- gmsh-tetgen-2.8.5~svn18983.orig/Mesh/Field.cpp
-+++ gmsh-tetgen-2.8.5~svn18983/Mesh/Field.cpp
+--- gmsh-tetgen-2.8.5~svn19081.orig/Mesh/Field.cpp
++++ gmsh-tetgen-2.8.5~svn19081/Mesh/Field.cpp
@@ -1340,17 +1340,21 @@ class MinAnisoField : public Field
}
virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
@@ -24,10 +24,10 @@
}
v = intersection_conserve_mostaniso(v,ff);
}
-Index: gmsh-tetgen-2.8.5~svn18983/Geo/STensor3.h
+Index: gmsh-tetgen-2.8.5~svn19081/Geo/STensor3.h
===================================================================
---- gmsh-tetgen-2.8.5~svn18983.orig/Geo/STensor3.h
-+++ gmsh-tetgen-2.8.5~svn18983/Geo/STensor3.h
+--- gmsh-tetgen-2.8.5~svn19081.orig/Geo/STensor3.h
++++ gmsh-tetgen-2.8.5~svn19081/Geo/STensor3.h
@@ -175,6 +175,8 @@ SMetric3 intersection (const SMetric3 &m
const SMetric3 &m2);
SMetric3 intersection_alauzet (const SMetric3 &m1,
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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch Wed Jul 9 09:11:54 2014
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainAntTweakBar.cpp
-===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/mainAntTweakBar.cpp 2013-09-28 09:34:56.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainAntTweakBar.cpp 2013-09-28 09:34:56.000000000 +0200
+Index: gmsh-tetgen-2.8.5~svn19081/utils/api_demos/mainAntTweakBar.cpp
+===================================================================
+--- gmsh-tetgen-2.8.5~svn19081.orig/utils/api_demos/mainAntTweakBar.cpp
++++ gmsh-tetgen-2.8.5~svn19081/utils/api_demos/mainAntTweakBar.cpp
@@ -14,6 +14,7 @@
#include "GModel.h"
#include "MElement.h"
@@ -10,10 +10,10 @@
static drawContext *ctx = 0;
static mousePosition clickPos, prevPos;
-Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainOcc.cpp
-===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/mainOcc.cpp 2013-09-28 09:34:56.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainOcc.cpp 2013-09-28 09:34:56.000000000 +0200
+Index: gmsh-tetgen-2.8.5~svn19081/utils/api_demos/mainOcc.cpp
+===================================================================
+--- gmsh-tetgen-2.8.5~svn19081.orig/utils/api_demos/mainOcc.cpp
++++ gmsh-tetgen-2.8.5~svn19081/utils/api_demos/mainOcc.cpp
@@ -19,7 +19,7 @@
#include "MElement.h"
@@ -23,11 +23,11 @@
#endif
#include <TopoDS_Shape.hxx>
#include <BRep_Tool.hxx>
-Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/CMakeLists.txt
-===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/CMakeLists.txt 2013-09-28 09:34:56.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/CMakeLists.txt 2013-09-28 09:34:56.000000000 +0200
-@@ -12,46 +12,81 @@
+Index: gmsh-tetgen-2.8.5~svn19081/utils/api_demos/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.8.5~svn19081.orig/utils/api_demos/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/utils/api_demos/CMakeLists.txt
+@@ -12,46 +12,81 @@ endif(DEFINED CMAKE_BUILD_TYPE)
project(api_demos CXX)
add_subdirectory(../.. "${CMAKE_CURRENT_BINARY_DIR}/gmsh")
@@ -131,10 +131,10 @@
add_executable(mainGeoFactory mainGeoFactory.cpp)
target_link_libraries(mainGeoFactory shared)
-Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainCartesian.cpp
-===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/mainCartesian.cpp 2013-09-28 09:34:56.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainCartesian.cpp 2013-09-28 09:34:56.000000000 +0200
+Index: gmsh-tetgen-2.8.5~svn19081/utils/api_demos/mainCartesian.cpp
+===================================================================
+--- gmsh-tetgen-2.8.5~svn19081.orig/utils/api_demos/mainCartesian.cpp
++++ gmsh-tetgen-2.8.5~svn19081/utils/api_demos/mainCartesian.cpp
@@ -12,7 +12,7 @@
#include "GmshMessage.h"
#include "cartesian.h"
@@ -144,7 +144,7 @@
cartesianBox<double> &box)
{
int id1 = box.getCellContainingPoint(x - rmax, y - rmax, z - rmax);
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,7 @@ static void insertActiveCells(double x,
box.insertActiveCell(box.getCellIndex(i, j, k));
}
@@ -153,7 +153,7 @@
{
// tolerance for desambiguation
const double tol = box.getLC() * 1.e-12;
-@@ -82,10 +82,10 @@
+@@ -82,10 +82,10 @@ static void computeLevelset(GModel *gm,
for (unsigned int j = 0; j < dist.size(); j++)
box.setNodalValue(indices[j], dist[j]);
@@ -166,7 +166,7 @@
{
Range<double> t_bounds = ge->parBounds(0);
double t_min = t_bounds.low();
-@@ -99,7 +99,7 @@
+@@ -99,7 +99,7 @@ static void fillPointCloud(GEdge *ge, do
}
}
@@ -175,7 +175,7 @@
{
cartesianBox<double> *child = parent->getChildBox();
if(!child) return 0;
-@@ -135,10 +135,10 @@
+@@ -135,10 +135,10 @@ static int removeBadChildCells(cartesian
(k != K - 1 && !parent->activeCellExists(parent->getCellIndex(i, j, k + 1)))))
for(int ii = 0; ii < 8; ii++) child->eraseActiveCell(idx[ii]);
}
@@ -188,7 +188,7 @@
{
if(!box->getChildBox()) return;
for(int i = 0; i < box->getNxi(); i++)
-@@ -157,7 +157,7 @@
+@@ -157,7 +157,7 @@ static void removeParentCellsWithChildre
}
}
}
@@ -197,7 +197,7 @@
}
static void removeOutsideCells(cartesianBox<double> *box)
-@@ -226,7 +226,7 @@
+@@ -226,7 +226,7 @@ int main(int argc,char *argv[])
double s = sampling / pow(2., levels - 1);
Msg::Info("Filling refined point cloud on curves and curved surfaces");
for (GModel::eiter eit = gm->firstEdge(); eit != gm->lastEdge(); eit++)
@@ -206,7 +206,7 @@
// FIXME: refine this by computing e.g. "mean" curvature
if(refineCurvedSurfaces){
-@@ -263,13 +263,13 @@
+@@ -263,13 +263,13 @@ int main(int argc,char *argv[])
Msg::Info("Inserting active cells in the cartesian grid");
Msg::Info(" level %d", box.getLevel());
for (unsigned int i = 0; i < points.size(); i++)
@@ -222,7 +222,7 @@
rtube / pow(2., (levels - child->getLevel())), *child);
parent = child;
}
-@@ -278,8 +278,8 @@
+@@ -278,8 +278,8 @@ int main(int argc,char *argv[])
// which there is no parent neighbor; then remove parent cells that
// have children
Msg::Info("Removing cells to match X-FEM mesh topology constraints");
@@ -233,7 +233,7 @@
// we generate duplicate nodes at this point so we can easily access
// cell values at each level; we will clean up by renumbering after
-@@ -288,7 +288,7 @@
+@@ -288,7 +288,7 @@ int main(int argc,char *argv[])
box.createNodalValues();
Msg::Info("Computing levelset on the cartesian grid");
@@ -242,10 +242,10 @@
Msg::Info("Removing cells outside the structure");
removeOutsideCells(&box);
-Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainElasticity.cpp
-===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/mainElasticity.cpp 2013-09-28 09:34:56.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainElasticity.cpp 2013-09-28 09:34:56.000000000 +0200
+Index: gmsh-tetgen-2.8.5~svn19081/utils/api_demos/mainElasticity.cpp
+===================================================================
+--- gmsh-tetgen-2.8.5~svn19081.orig/utils/api_demos/mainElasticity.cpp
++++ gmsh-tetgen-2.8.5~svn19081/utils/api_demos/mainElasticity.cpp
@@ -3,6 +3,7 @@
#include "elasticitySolver.h"
#include "PView.h"
@@ -254,10 +254,10 @@
void Info (int i, char* c){
printf("%d %s\n",i,c);
-Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainHomology.cpp
-===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/mainHomology.cpp 2013-09-28 09:34:56.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainHomology.cpp 2013-09-28 09:34:56.000000000 +0200
+Index: gmsh-tetgen-2.8.5~svn19081/utils/api_demos/mainHomology.cpp
+===================================================================
+--- gmsh-tetgen-2.8.5~svn19081.orig/utils/api_demos/mainHomology.cpp
++++ gmsh-tetgen-2.8.5~svn19081/utils/api_demos/mainHomology.cpp
@@ -8,6 +8,7 @@
#include <stdio.h>
@@ -266,10 +266,10 @@
#include "Gmsh.h"
#include "GModel.h"
#include "MElement.h"
-Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindGmsh.cmake
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindGmsh.cmake 2013-09-28 09:34:56.000000000 +0200
+Index: gmsh-tetgen-2.8.5~svn19081/utils/api_demos/cmake/modules/FindGmsh.cmake
+===================================================================
+--- /dev/null
++++ gmsh-tetgen-2.8.5~svn19081/utils/api_demos/cmake/modules/FindGmsh.cmake
@@ -0,0 +1,119 @@
+# -*- mode: cmake -*-
+#
@@ -390,10 +390,10 @@
+
+
+
-Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindAnttweakbar.cmake
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindAnttweakbar.cmake 2013-09-28 09:36:05.000000000 +0200
+Index: gmsh-tetgen-2.8.5~svn19081/utils/api_demos/cmake/modules/FindAnttweakbar.cmake
+===================================================================
+--- /dev/null
++++ gmsh-tetgen-2.8.5~svn19081/utils/api_demos/cmake/modules/FindAnttweakbar.cmake
@@ -0,0 +1,12 @@
+FIND_LIBRARY(ANTTWEAKBAR_LIB AntTweakBar PATHS /usr/lib /opt/local/lib $ENV{ANTTWEAKBAR_DIR}/lib)
+SET(ANTTWEAKBAR_LIBRARIES ${ANTTWEAKBAR_LIB} )
@@ -407,10 +407,10 @@
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ANTTWEAKBAR "Could not find ANTTWEAKBAR " ANTTWEAKBAR_INCLUDE_DIR ANTTWEAKBAR_LIB)
+# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(ANTTWEAKBAR_INCLUDE_DIR ANTTWEAKBAR_LIBRARIES )
-Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindOCC.cmake
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindOCC.cmake 2013-09-28 09:37:15.000000000 +0200
+Index: gmsh-tetgen-2.8.5~svn19081/utils/api_demos/cmake/modules/FindOCC.cmake
+===================================================================
+--- /dev/null
++++ gmsh-tetgen-2.8.5~svn19081/utils/api_demos/cmake/modules/FindOCC.cmake
@@ -0,0 +1,34 @@
+set(OCC_LIBS_REQUIRED
+ # subset of DataExchange
@@ -446,10 +446,10 @@
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OCC "Could not find OCC " OCC_INCLUDE_DIR OCC_LIBRARIES)
+# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(OCC_INCLUDE_DIR OCC_LIBRARIES )
-Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindGLUT.cmake
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindGLUT.cmake 2013-09-28 09:35:44.000000000 +0200
+Index: gmsh-tetgen-2.8.5~svn19081/utils/api_demos/cmake/modules/FindGLUT.cmake
+===================================================================
+--- /dev/null
++++ gmsh-tetgen-2.8.5~svn19081/utils/api_demos/cmake/modules/FindGLUT.cmake
@@ -0,0 +1,20 @@
+include (FindPackageHandleStandardArgs)
+
@@ -471,10 +471,10 @@
+# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(GLUT_LIBRARY )
+MARK_AS_ADVANCED(GLU_LIBRARY )
-Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindANN.cmake
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindANN.cmake 2013-09-28 09:34:56.000000000 +0200
+Index: gmsh-tetgen-2.8.5~svn19081/utils/api_demos/cmake/modules/FindANN.cmake
+===================================================================
+--- /dev/null
++++ gmsh-tetgen-2.8.5~svn19081/utils/api_demos/cmake/modules/FindANN.cmake
@@ -0,0 +1,44 @@
+# -*- mode: cmake -*-
+#
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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/cgns.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/cgns.patch Wed Jul 9 09:11:54 2014
@@ -3,11 +3,11 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2013-04-02
-Index: gmsh-tetgen-2.8.4~svn16803/Geo/GModelIO_CGNS.cpp
+Index: gmsh-tetgen-2.8.5~svn19081/Geo/GModelIO_CGNS.cpp
===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/Geo/GModelIO_CGNS.cpp 2013-09-28 09:37:33.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/Geo/GModelIO_CGNS.cpp 2013-09-28 09:37:33.000000000 +0200
-@@ -155,24 +155,24 @@
+--- gmsh-tetgen-2.8.5~svn19081.orig/Geo/GModelIO_CGNS.cpp
++++ gmsh-tetgen-2.8.5~svn19081/Geo/GModelIO_CGNS.cpp
+@@ -155,24 +155,24 @@ class CGNSNameStr
// 1D second-order elements
// MSH_NUM_TYPE+1 is used to place non-cgns elements last.
static const int msh2cgns[MSH_NUM_TYPE][2] = {
@@ -49,7 +49,7 @@
{-1, MSH_NUM_TYPE+1}, // MSH_PYR_13
{-1, MSH_NUM_TYPE+1}, // MSH_TRI_9
{-1, MSH_NUM_TYPE+1}, // MSH_TRI_10
-@@ -587,9 +587,9 @@
+@@ -587,9 +587,9 @@ int GModel::readCGNS(const std::string &
for (int index_zone = 1; index_zone <= nZones; index_zone++) {
Msg::Debug("Reading zone to compute MG level %i.", index_zone);
@@ -61,7 +61,7 @@
Msg::Debug("Unstructured zone detected, skipping.");
continue;
}
-@@ -645,9 +645,9 @@
+@@ -645,9 +645,9 @@ int GModel::readCGNS(const std::string &
int offset = vnum;
@@ -73,7 +73,7 @@
Msg::Debug("Unstructured zone detected, skipping.");
continue;
}
-@@ -681,7 +681,7 @@
+@@ -681,7 +681,7 @@ int GModel::readCGNS(const std::string &
int nCoords;
cg_ncoords(index_file, index_base, index_zone, &nCoords);
@@ -82,7 +82,7 @@
char coordName[35];
void* coord;
double nodes[nnodesZone][nCoords];
-@@ -696,7 +696,7 @@
+@@ -696,7 +696,7 @@ int GModel::readCGNS(const std::string &
Msg::Debug("Reading coordinate %i : %s.", iCoord+1, coordName);
switch(dataType) {
@@ -91,7 +91,7 @@
Msg::Debug(" [Type is float]");
coord = new float[nnodesZone];
if ( cg_coord_read(index_file, index_base, index_zone, coordName, dataType, irmin, irmax, coord)) {
-@@ -709,7 +709,7 @@
+@@ -709,7 +709,7 @@ int GModel::readCGNS(const std::string &
}
delete [] (float*)coord;
break;
@@ -100,7 +100,7 @@
Msg::Debug(" [Type is double]");
coord = new double[nnodesZone];
if ( cg_coord_read(index_file, index_base, index_zone, coordName, dataType, irmin, irmax, coord)) {
-@@ -1491,8 +1491,9 @@
+@@ -1491,8 +1491,9 @@ struct ZoneTask
ZoneTask() : status(0), indexInOwner(0) { }
void change_status(const int _status)
{
@@ -112,7 +112,7 @@
}
};
-@@ -1583,7 +1584,7 @@
+@@ -1583,7 +1584,7 @@ int write_CGNS_zones(GModel &model, cons
cgZoneSize[2] = writeZone->numBoVert; // Number of boundary vertices
if(cg_zone_write(cgIndexFile, cgIndexBase,
writeTask->zoneName.c_str(), cgZoneSize,
@@ -121,7 +121,7 @@
{
return cgnsErr();
}
-@@ -1610,7 +1611,7 @@
+@@ -1610,7 +1611,7 @@ int write_CGNS_zones(GModel &model, cons
for (int i = 0; i != cgZoneSize[0]; ++i) {
dBuffer[i] = writeZone->zoneVertVec[i]->x()*scalingFactor;
}
@@ -130,7 +130,7 @@
"CoordinateX", &dBuffer[0], &cgIndexCoord))
return cgnsErr();
-@@ -1618,7 +1619,7 @@
+@@ -1618,7 +1619,7 @@ int write_CGNS_zones(GModel &model, cons
for(int i = 0; i != cgZoneSize[0]; ++i) {
dBuffer[i] = writeZone->zoneVertVec[i]->y()*scalingFactor;
}
@@ -139,7 +139,7 @@
"CoordinateY", &dBuffer[0], &cgIndexCoord))
return cgnsErr();
-@@ -1627,7 +1628,7 @@
+@@ -1627,7 +1628,7 @@ int write_CGNS_zones(GModel &model, cons
for(int i = 0; i != cgZoneSize[0]; ++i) {
dBuffer[i] = writeZone->zoneVertVec[i]->z()*scalingFactor;
}
@@ -148,7 +148,7 @@
"CoordinateZ", &dBuffer[0], &cgIndexCoord))
return cgnsErr();
}
-@@ -1707,7 +1708,7 @@
+@@ -1707,7 +1708,7 @@ int write_CGNS_zones(GModel &model, cons
int cgIndexSection;
if(cg_section_write
(cgIndexFile, cgIndexBase, cgIndexZone, elemName,
@@ -157,7 +157,7 @@
writeZone->zoneElemConn[typeMSHm1].numElem + iElemSection,
writeZone->zoneElemConn[typeMSHm1].numBoElem + iElemSection,
(cgsize_t*)&writeZone->zoneElemConn[typeMSHm1].connectivity[0],
-@@ -1747,9 +1748,9 @@
+@@ -1747,9 +1748,9 @@ int write_CGNS_zones(GModel &model, cons
// In the first zone
if(cg_conn_write
(cgIndexFile, cgIndexBase, zoneInfo[gCIt->first.zone1].cgIndex,
@@ -169,7 +169,7 @@
&cgIndexInterface))
{
return cgnsErr();
-@@ -1757,9 +1758,9 @@
+@@ -1757,9 +1758,9 @@ int write_CGNS_zones(GModel &model, cons
// In the second zone
if(cg_conn_write
(cgIndexFile, cgIndexBase, zoneInfo[gCIt->first.zone2].cgIndex,
@@ -181,7 +181,7 @@
&cgIndexInterface))
{
return cgnsErr();
-@@ -1879,7 +1880,7 @@
+@@ -1879,7 +1880,7 @@ int write_CGNS_zones(GModel &model, cons
}
if(cg_boco_write(cgIndexFile, cgIndexBase,
zoneInfo[zoneIndex].cgIndex, patchName.c_str(),
@@ -190,7 +190,7 @@
&cgIndexBoco))
{
return cgnsErr();
-@@ -1889,7 +1890,7 @@
+@@ -1889,7 +1890,7 @@ int write_CGNS_zones(GModel &model, cons
int normalIndex;
if(cg_boco_normal_write(cgIndexFile, cgIndexBase,
zoneInfo[zoneIndex].cgIndex, cgIndexBoco,
@@ -199,11 +199,11 @@
{
return cgnsErr();
}
-Index: gmsh-tetgen-2.8.4~svn16803/Geo/CustomContainer.h
+Index: gmsh-tetgen-2.8.5~svn19081/Geo/CustomContainer.h
===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/Geo/CustomContainer.h 2013-09-28 09:37:33.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/Geo/CustomContainer.h 2013-09-28 09:37:33.000000000 +0200
-@@ -570,7 +570,7 @@
+--- gmsh-tetgen-2.8.5~svn19081.orig/Geo/CustomContainer.h
++++ gmsh-tetgen-2.8.5~svn19081/Geo/CustomContainer.h
+@@ -570,7 +570,7 @@ class FaceVector : public FaceAllocator<
}
// Destructor
@@ -212,7 +212,7 @@
// Index the vector
const T &operator[](const int i) const { return faces[i]; }
-@@ -579,7 +579,7 @@
+@@ -579,7 +579,7 @@ class FaceVector : public FaceAllocator<
// Add element to end
T &push_back(const T val)
{
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=46799&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 Wed Jul 9 09:11:54 2014
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
-Index: gmsh-tetgen-2.8.5~svn18982/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn18982/wrappers/java/CMakeLists.txt
+--- gmsh-tetgen-2.8.5~svn19081.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/wrappers/java/CMakeLists.txt
@@ -34,7 +34,11 @@ if(WIN32)
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
@@ -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~svn18982/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
-@@ -1286,7 +1286,7 @@ endforeach(DIR)
+--- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+@@ -1299,7 +1299,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)
-@@ -1313,10 +1313,10 @@ endif(ENABLE_BUILD_ANDROID)
+@@ -1326,10 +1326,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=46799&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 Wed Jul 9 09:11:54 2014
@@ -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.8.5~svn18982/Graphics/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/Graphics/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/Graphics/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn18982/Graphics/CMakeLists.txt
+--- gmsh-tetgen-2.8.5~svn19081.orig/Graphics/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/Graphics/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SRC
drawScales.cpp
drawGraph2d.cpp
@@ -14,11 +14,11 @@
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
-@@ -1347,7 +1347,7 @@ else(HAVE_FLTK)
+--- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+@@ -1360,7 +1360,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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch Wed Jul 9 09:11:54 2014
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-04-08
-Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
===================================================================
---- 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
+--- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+@@ -1337,7 +1337,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_gmshpy_import.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch?rev=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch Wed Jul 9 09:11:54 2014
@@ -3,10 +3,10 @@
Bug-Debian: http://bugs.debian.org/696420
Last-Update: 2013-01-26
-Index: gmsh-tetgen-2.8.2~svn16203/wrappers/gmshpy/__init__.py.in
+Index: gmsh-tetgen-2.8.5~svn19081/wrappers/gmshpy/__init__.py.in
===================================================================
---- gmsh-tetgen-2.8.2~svn16203.orig/wrappers/gmshpy/__init__.py.in 2013-07-18 15:58:49.000000000 +0200
-+++ gmsh-tetgen-2.8.2~svn16203/wrappers/gmshpy/__init__.py.in 2013-07-18 15:58:49.000000000 +0200
+--- gmsh-tetgen-2.8.5~svn19081.orig/wrappers/gmshpy/__init__.py.in
++++ gmsh-tetgen-2.8.5~svn19081/wrappers/gmshpy/__init__.py.in
@@ -1,4 +1,7 @@
# set Ctrl-C to default signal (terminates immediately)
+from ctypes import *
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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch Wed Jul 9 09:11:54 2014
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
-Index: gmsh-tetgen-2.8.5~svn18982/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn18982/wrappers/java/CMakeLists.txt
+--- gmsh-tetgen-2.8.5~svn19081.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/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
@@ -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~svn18982/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
===================================================================
---- 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)
+--- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+@@ -1481,7 +1481,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)
-@@ -1504,7 +1504,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1517,7 +1517,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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch Wed Jul 9 09:11:54 2014
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-05-12
-Index: gmsh-tetgen-2.8.5~svn18982/contrib/onelab/python/onelab.py
+Index: gmsh-tetgen-2.8.5~svn19081/contrib/onelab/python/onelab.py
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/contrib/onelab/python/onelab.py
-+++ gmsh-tetgen-2.8.5~svn18982/contrib/onelab/python/onelab.py
+--- gmsh-tetgen-2.8.5~svn19081.orig/contrib/onelab/python/onelab.py
++++ gmsh-tetgen-2.8.5~svn19081/contrib/onelab/python/onelab.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
"""
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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch Wed Jul 9 09:11:54 2014
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.8.5~svn18982/Plugin/Bubbles.cpp
+Index: gmsh-tetgen-2.8.5~svn19081/Plugin/Bubbles.cpp
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/Plugin/Bubbles.cpp
-+++ gmsh-tetgen-2.8.5~svn18982/Plugin/Bubbles.cpp
+--- gmsh-tetgen-2.8.5~svn19081.orig/Plugin/Bubbles.cpp
++++ gmsh-tetgen-2.8.5~svn19081/Plugin/Bubbles.cpp
@@ -31,7 +31,7 @@ std::string GMSH_BubblesPlugin::getHelp(
{
return "Plugin(Bubbles) constructs a geometry consisting of "
@@ -15,10 +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.";
-Index: gmsh-tetgen-2.8.5~svn18982/contrib/lbfgs/alglibinternal.cpp
+Index: gmsh-tetgen-2.8.5~svn19081/contrib/lbfgs/alglibinternal.cpp
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/contrib/lbfgs/alglibinternal.cpp
-+++ gmsh-tetgen-2.8.5~svn18982/contrib/lbfgs/alglibinternal.cpp
+--- gmsh-tetgen-2.8.5~svn19081.orig/contrib/lbfgs/alglibinternal.cpp
++++ gmsh-tetgen-2.8.5~svn19081/contrib/lbfgs/alglibinternal.cpp
@@ -3679,8 +3679,8 @@ void matrixvectormultiply(/* Real */
{
return;
@@ -41,10 +41,10 @@
/*
* beta*y
-Index: gmsh-tetgen-2.8.5~svn18982/doc/texinfo/gmsh.texi
+Index: gmsh-tetgen-2.8.5~svn19081/doc/texinfo/gmsh.texi
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/doc/texinfo/gmsh.texi
-+++ gmsh-tetgen-2.8.5~svn18982/doc/texinfo/gmsh.texi
+--- gmsh-tetgen-2.8.5~svn19081.orig/doc/texinfo/gmsh.texi
++++ gmsh-tetgen-2.8.5~svn19081/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.
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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/metis.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/metis.patch Wed Jul 9 09:11:54 2014
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.8.4~svn16803/contrib/Metis/util.c
+Index: gmsh-tetgen-2.8.5~svn19081/contrib/Metis/util.c
===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/contrib/Metis/util.c 2013-09-28 09:37:41.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/contrib/Metis/util.c 2013-09-28 09:37:41.000000000 +0200
-@@ -28,7 +28,7 @@
+--- gmsh-tetgen-2.8.5~svn19081.orig/contrib/Metis/util.c
++++ gmsh-tetgen-2.8.5~svn19081/contrib/Metis/util.c
+@@ -28,7 +28,7 @@ void errexit(char *f_str,...)
sprintf(out2, "Error! %s", out1);
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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/netgen.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/netgen.patch Wed Jul 9 09:11:54 2014
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
-@@ -714,10 +714,36 @@ if(HAVE_MESH)
+--- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+@@ -723,10 +723,36 @@ if(HAVE_MESH)
endif(ENABLE_BLOSSOM)
if(ENABLE_NETGEN)
@@ -41,7 +41,7 @@
add_definitions(-DNO_PARALLEL_THREADS -DNOTCL)
endif(ENABLE_NETGEN)
-@@ -1062,8 +1088,13 @@ if(ENABLE_OCC)
+@@ -1071,8 +1097,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~svn18982/contrib/Netgen/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/contrib/Netgen/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/contrib/Netgen/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn18982/contrib/Netgen/CMakeLists.txt
+--- gmsh-tetgen-2.8.5~svn19081.orig/contrib/Netgen/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/series (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/series Wed Jul 9 09:11:54 2014
@@ -18,3 +18,4 @@
netgen.patch
tetgen.patch
#doc.patch
+med.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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch Wed Jul 9 09:11:54 2014
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
-@@ -1398,7 +1398,7 @@ if(UNIX)
+--- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+@@ -1411,7 +1411,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/?*.*)
-@@ -1564,7 +1564,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+@@ -1576,7 +1576,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=46799&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch Wed Jul 9 09:11:54 2014
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
+Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.5~svn18982.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn18982/CMakeLists.txt
-@@ -767,29 +767,30 @@ if(HAVE_MESH)
+--- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+@@ -776,29 +776,30 @@ if(HAVE_MESH)
set_config_option(HAVE_MMG3D "Mmg3d")
endif(ENABLE_MMG3D)
More information about the debian-science-commits
mailing list