r45207 - in /packages/gmsh-tetgen/trunk/debian: ./ patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Wed Jul 4 20:43:49 UTC 2012
Author: trophime-guest
Date: Wed Jul 4 20:43:47 2012
New Revision: 45207
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45207
Log:
update to 2.6.0
Modified:
packages/gmsh-tetgen/trunk/debian/README.Debian
packages/gmsh-tetgen/trunk/debian/changelog
packages/gmsh-tetgen/trunk/debian/control
packages/gmsh-tetgen/trunk/debian/copyright
packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.desktop
packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.install
packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.lintian-overrides
packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.menu
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/pedantic.patch
packages/gmsh-tetgen/trunk/debian/patches/series
packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch
packages/gmsh-tetgen/trunk/debian/rules
Modified: packages/gmsh-tetgen/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/README.Debian?rev=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/README.Debian (original)
+++ packages/gmsh-tetgen/trunk/debian/README.Debian Wed Jul 4 20:43:47 2012
@@ -1,4 +1,4 @@
-gmsh-tetgen for Debian
+gmsh for Debian
---------------
Gmsh is an academic 3D mesh generator with a simple enough interface.
Modified: packages/gmsh-tetgen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/changelog?rev=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/changelog (original)
+++ packages/gmsh-tetgen/trunk/debian/changelog Wed Jul 4 20:43:47 2012
@@ -1,3 +1,14 @@
+gmsh-tetgen (2.6.0-1) unstable; urgency=low
+
+ [Anton Gladky]
+ * merge with git
+ * split into several packages
+
+ * add support for java wrappers
+ * add a bibentry in debian/upstream
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Wed, 04 Jul 2012 22:37:11 +0200
+
gmsh-tetgen (2.5.1~beta2~svn12367-1) unstable; urgency=low
* update to latest svn rev
Modified: packages/gmsh-tetgen/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/control?rev=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/control (original)
+++ packages/gmsh-tetgen/trunk/debian/control Wed Jul 4 20:43:47 2012
@@ -1,5 +1,5 @@
Source: gmsh-tetgen
-Section: non-free/math
+Section: math
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>,
@@ -11,26 +11,28 @@
mpi-default-dev,
libgmm++-dev [!hurd-i386 !s390x],
liboce-modeling-dev, liboce-visualization-dev, liboce-ocaf-dev, oce-draw,
- libcgns-dev (>= 3.1.3.2),
+ libcgns-dev (>= 3.1.3.4),
libmed-dev (>= 2.3.6), libmedc-dev (>= 2.3.6),
libhdf5-mpi-dev (>= 1.8.8) [alpha amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc],
libblas-dev, liblapack-dev, libgl2ps-dev, freeglut3-dev,
- python-dev (>= 2.6.6-3~), swig,
+ python-dev (>= 2.6.6-3~), swig2.0,
chrpath, libann-dev,
libpetsc3.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
- libslepc3.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x]
+ libslepc3.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
+ javahelper, default-jdk
Standards-Version: 3.9.3
DM-Upload-Allowed: yes
X-Python-Version: current
-Vcs-Svn: svn://svn.debian.org/debian-science/packages/gmsh-tetgen/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/
+Vcs-Git: git://git.debian.org/git/debian-science/packages/gmsh.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gmsh.git
Homepage: http://www.geuz.org/gmsh/
Package: gmsh-tetgen
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
- python (>= 2.7), python (<<2.8)
-Conflicts: gmsh
+ libgmsh2-tetgen
+Recommends: gmsh-doc
+Replaces: gmsh
Provides: gmsh
Description: Three-dimensional finite element mesh generator
Gmsh is an automatic 3D finite element mesh generator (primarily
@@ -46,5 +48,110 @@
.
See Gmsh's reference manual for a more thorough overview of Gmsh's
capabilities.
+
+Package: libgmsh2-tetgen
+Architecture: any
+Replaces: libgmsh2
+Provides: libgmsh2
+Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin
+Description: Three-dimensional finite element mesh generator. Shared library
+ Gmsh is an automatic 3D finite element mesh generator (primarily
+ Delaunay) with build-in CAD and post-processing facilities. Its
+ design goal is to provide a simple meshing tool for academic test
+ cases with parametric input and up to date visualization
+ capabilities.
.
- This version is build with tetgen 1.5 and metis
+ Gmsh is built around four modules: geometry, mesh, solver and
+ post-processing. The specification of any input to these modules is
+ done either interactively using the graphical user interface or in
+ ASCII text files using Gmsh's own scripting language.
+ .
+ See Gmsh's reference manual for a more thorough overview of Gmsh's
+ capabilities.
+
+Package: libgmsh-tetgen-dev
+Architecture: all
+Section: libdevel
+Replaces: libgmsh-dev
+Provides: libgmsh-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin
+Description: Three-dimensional finite element mesh generator. Development files
+ Gmsh is an automatic 3D finite element mesh generator (primarily
+ Delaunay) with build-in CAD and post-processing facilities. Its
+ design goal is to provide a simple meshing tool for academic test
+ cases with parametric input and up to date visualization
+ capabilities.
+ .
+ Gmsh is built around four modules: geometry, mesh, solver and
+ post-processing. The specification of any input to these modules is
+ done either interactively using the graphical user interface or in
+ ASCII text files using Gmsh's own scripting language.
+ .
+ See Gmsh's reference manual for a more thorough overview of Gmsh's
+ capabilities.
+
+Package: gmsh-tetgen-doc
+Section: doc
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin
+Description: Three-dimensional finite element mesh generator. Documentation
+ Gmsh is an automatic 3D finite element mesh generator (primarily
+ Delaunay) with build-in CAD and post-processing facilities. Its
+ design goal is to provide a simple meshing tool for academic test
+ cases with parametric input and up to date visualization
+ capabilities.
+ .
+ Gmsh is built around four modules: geometry, mesh, solver and
+ post-processing. The specification of any input to these modules is
+ done either interactively using the graphical user interface or in
+ ASCII text files using Gmsh's own scripting language.
+ .
+ See Gmsh's reference manual for a more thorough overview of Gmsh's
+ capabilities.
+
+Package: python-gmsh-tetgen
+Section: python
+Architecture: any
+Replaces: python-gmsh
+Provides: python-gmsh
+Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
+ python (>= 2.7), python (<<2.8)
+Description: Three-dimensional finite element mesh generator. Python wrapper
+ Gmsh is an automatic 3D finite element mesh generator (primarily
+ Delaunay) with build-in CAD and post-processing facilities. Its
+ design goal is to provide a simple meshing tool for academic test
+ cases with parametric input and up to date visualization
+ capabilities.
+ .
+ Gmsh is built around four modules: geometry, mesh, solver and
+ post-processing. The specification of any input to these modules is
+ done either interactively using the graphical user interface or in
+ ASCII text files using Gmsh's own scripting language.
+ .
+ See Gmsh's reference manual for a more thorough overview of Gmsh's
+ capabilities.
+ .
+ This package contains the python wrappers for gmsh
+
+Package: java-gmsh-tetgen
+Section: python
+Architecture: any
+Replaces: java-gmsh
+Provides: java-gmsh
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre
+Description: Three-dimensional finite element mesh generator. Java-wrappwe
+ Gmsh is an automatic 3D finite element mesh generator (primarily
+ Delaunay) with build-in CAD and post-processing facilities. Its
+ design goal is to provide a simple meshing tool for academic test
+ cases with parametric input and up to date visualization
+ capabilities.
+ .
+ Gmsh is built around four modules: geometry, mesh, solver and
+ post-processing. The specification of any input to these modules is
+ done either interactively using the graphical user interface or in
+ ASCII text files using Gmsh's own scripting language.
+ .
+ See Gmsh's reference manual for a more thorough overview of Gmsh's
+ capabilities.
+ .
+ This package contains the python wrappers for gmsh
Modified: packages/gmsh-tetgen/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/copyright?rev=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/copyright (original)
+++ packages/gmsh-tetgen/trunk/debian/copyright Wed Jul 4 20:43:47 2012
@@ -2,7 +2,7 @@
Source: http://www.geuz.org/gmsh/
Files: *
-Copyright: 1997-2012 Christophe Geuzaine <geuzaine at cgeuzaine@ulg.ac.be>
+Copyright: 1997-2012 Christophe Geuzaine <geuzaine at acm.caltech.edu>
Jean-Francois Remacle <remacle at gce.ucl.ac.be>
License: GPL-2+, with the following exception:
The copyright holders of Gmsh give you permission to combine Gmsh
Modified: packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.desktop
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.desktop?rev=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.desktop (original)
+++ packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.desktop Wed Jul 4 20:43:47 2012
@@ -1,10 +1,10 @@
[Desktop Entry]
Version=1.0
-Name=Gmsh Mesh Generator
-GenericName=Gmsh
+Name=Gmsh Mesh Generator (Tetgen version).
+GenericName=Gmsh-Tetgen
Comment=3-D finite element mesh generator
-Exec=gmsh
-Icon=/usr/share/pixmaps/gmsh_32x32.xpm
+Exec=gmsh-tetgen
+Icon=/usr/share/pixmaps/gmsh-tetgen_32x32.xpm
Type=Application
Terminal=false
Categories=Education;Math;Science;
Modified: packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.install
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.install?rev=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.install (original)
+++ packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.install Wed Jul 4 20:43:47 2012
@@ -1,18 +1,3 @@
debian/*.xpm /usr/share/pixmaps
-debian/gmsh-tetgen.desktop /usr/share/applications
-#The following files are for compiling api_demos
-Common/Gmsh.h /usr/include/gmsh
-Geo/Chain.h /usr/include/gmsh
-Graphics/Camera.h /usr/include/gmsh
-Graphics/Trackball.h /usr/include/gmsh
-Solver/functionSpace.h /usr/include/gmsh
-Solver/STensor43.h /usr/include/gmsh
-Solver/STensor33.h /usr/include/gmsh
-Common/OS.h /usr/include/gmsh
-Common/Options.h /usr/include/gmsh
-Post/ColorTable.h /usr/include/gmsh
-Post/PViewOptions.h /usr/include/gmsh
-Common/OpenFile.h /usr/include/gmsh
-Common/StringUtils.h /usr/include/gmsh
-Mesh/Field.h /usr/include/gmsh
-Post/PViewData.h /usr/include/gmsh
+debian/*.desktop /usr/share/applications
+usr/bin
Modified: packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.lintian-overrides?rev=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.lintian-overrides (original)
+++ packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.lintian-overrides Wed Jul 4 20:43:47 2012
@@ -1,3 +1,3 @@
-gmsh-tetgen: package-name-doesnt-match-sonames libgmsh1
-gmsh-tetgen: extra-license-file usr/share/doc/gmsh/converters/stl_to_cartesian/LICENCE.txt
+gmsh-tetgen: package-name-doesnt-match-sonames libgmsh-tetgen-2.5.1
+gmsh-tetgen: extra-license-file usr/share/doc/gmsh-tetgen/converters/stl_to_cartesian/LICENCE.txt
#It is not a license file, just a link on topic of forum, where it was published
Modified: packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.menu
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.menu?rev=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.menu (original)
+++ packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.menu Wed Jul 4 20:43:47 2012
@@ -3,6 +3,6 @@
section="Applications/Science/Engineering" \
title="Gmsh" \
command="/usr/bin/gmsh" \
- icon="/usr/share/pixmaps/gmsh_32x32.xpm" \
- icon16x16="/usr/share/pixmaps/gmsh_16x16.xpm" \
- icon32x32="/usr/share/pixmaps/gmsh_32x32.xpm"
+ icon="/usr/share/pixmaps/gmsh-tetgen_32x32.xpm" \
+ icon16x16="/usr/share/pixmaps/gmsh-tetgen_16x16.xpm" \
+ icon32x32="/usr/share/pixmaps/gmsh-tetgen_32x32.xpm"
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=45207&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 4 20:43:47 2012
@@ -1,7 +1,10 @@
-Index: gmsh-tetgen-2.5.1~beta2~svn12259.orig/CMakeLists.txt
-===================================================================
---- gmsh-tetgen-2.5.1~beta2~svn12259.orig/CMakeLists.txt (revision 12259)
-+++ gmsh-tetgen-2.5.1~beta2~svn12259/CMakeLists.txt (working copy)
+Description: Adds missing headers
+Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-06-24
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -82,6 +82,7 @@
${CMAKE_CURRENT_BINARY_DIR}/Common/GmshVersion.h
Common/Gmsh.h Common/Context.h Common/GmshDefines.h Common/GmshMessage.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=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch Wed Jul 4 20:43:47 2012
@@ -3,10 +3,8 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-03-11
-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
+--- a/utils/api_demos/CMakeLists.txt
++++ b/utils/api_demos/CMakeLists.txt
@@ -9,45 +9,691 @@
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose build type")
endif(DEFINED CMAKE_BUILD_TYPE)
@@ -716,10 +714,8 @@
-target_link_libraries(mainSimple shared)
+target_link_libraries(mainSimple ${LINK_LIBRARIES})
-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
+--- a/utils/api_demos/mainAntTweakBar.cpp
++++ b/utils/api_demos/mainAntTweakBar.cpp
@@ -14,6 +14,7 @@
#include "GModel.h"
#include "MElement.h"
@@ -728,10 +724,8 @@
static drawContext *ctx = 0;
static mousePosition clickPos, prevPos;
-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
+--- a/utils/api_demos/mainCartesian.cpp
++++ b/utils/api_demos/mainCartesian.cpp
@@ -12,7 +12,7 @@
#include "GmshMessage.h"
#include "cartesian.h"
@@ -839,10 +833,8 @@
Msg::Info("Removing cells outside the structure");
removeOutsideCells(&box);
-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
+--- a/utils/api_demos/mainElasticity.cpp
++++ b/utils/api_demos/mainElasticity.cpp
@@ -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=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/cgns.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/cgns.patch Wed Jul 4 20:43:47 2012
@@ -1,8 +1,11 @@
-Index: gmsh-tetgen-2.5.1~beta2~svn12051/Geo/GModelIO_CGNS.cpp
-===================================================================
---- 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 @@
+Description: <short summary of the patch>
+Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: <YYYY-MM-DD>
+
+--- gmsh-2.5.1~beta2~svn12143~dfsg.orig/Geo/GModelIO_CGNS.cpp
++++ gmsh-2.5.1~beta2~svn12143~dfsg/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] = {
@@ -44,7 +47,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);
@@ -56,7 +59,7 @@
Msg::Debug("Unstructured zone detected, skipping.");
continue;
}
-@@ -644,9 +644,9 @@
+@@ -644,9 +644,9 @@ int GModel::readCGNS(const std::string &
int offset = vnum;
@@ -68,7 +71,7 @@
Msg::Debug("Unstructured zone detected, skipping.");
continue;
}
-@@ -680,7 +680,7 @@
+@@ -680,7 +680,7 @@ int GModel::readCGNS(const std::string &
int nCoords;
cg_ncoords(index_file, index_base, index_zone, &nCoords);
@@ -77,7 +80,7 @@
char coordName[35];
void* coord;
double nodes[nnodesZone][nCoords];
-@@ -695,7 +695,7 @@
+@@ -695,7 +695,7 @@ int GModel::readCGNS(const std::string &
Msg::Debug("Reading coordinate %i : %s.", iCoord+1, coordName);
switch(dataType) {
@@ -86,7 +89,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)) {
-@@ -708,7 +708,7 @@
+@@ -708,7 +708,7 @@ int GModel::readCGNS(const std::string &
}
delete [] (float*)coord;
break;
@@ -95,7 +98,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)) {
-@@ -1490,7 +1490,8 @@
+@@ -1490,7 +1490,8 @@ struct ZoneTask
ZoneTask() : status(0), indexInOwner(0) { }
void change_status(const int _status)
{
@@ -105,7 +108,7 @@
status = _status;
}
};
-@@ -1582,7 +1583,7 @@
+@@ -1582,7 +1583,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,
@@ -114,7 +117,7 @@
{
return cgnsErr();
}
-@@ -1609,7 +1610,7 @@
+@@ -1609,7 +1610,7 @@ int write_CGNS_zones(GModel &model, cons
for (int i = 0; i != cgZoneSize[0]; ++i) {
dBuffer[i] = writeZone->zoneVertVec[i]->x()*scalingFactor;
}
@@ -123,7 +126,7 @@
"CoordinateX", &dBuffer[0], &cgIndexCoord))
return cgnsErr();
-@@ -1617,7 +1618,7 @@
+@@ -1617,7 +1618,7 @@ int write_CGNS_zones(GModel &model, cons
for(int i = 0; i != cgZoneSize[0]; ++i) {
dBuffer[i] = writeZone->zoneVertVec[i]->y()*scalingFactor;
}
@@ -132,7 +135,7 @@
"CoordinateY", &dBuffer[0], &cgIndexCoord))
return cgnsErr();
-@@ -1626,7 +1627,7 @@
+@@ -1626,7 +1627,7 @@ int write_CGNS_zones(GModel &model, cons
for(int i = 0; i != cgZoneSize[0]; ++i) {
dBuffer[i] = writeZone->zoneVertVec[i]->z()*scalingFactor;
}
@@ -141,7 +144,7 @@
"CoordinateZ", &dBuffer[0], &cgIndexCoord))
return cgnsErr();
}
-@@ -1706,7 +1707,7 @@
+@@ -1706,7 +1707,7 @@ int write_CGNS_zones(GModel &model, cons
int cgIndexSection;
if(cg_section_write
(cgIndexFile, cgIndexBase, cgIndexZone, elemName,
@@ -150,7 +153,7 @@
writeZone->zoneElemConn[typeMSHm1].numElem + iElemSection,
writeZone->zoneElemConn[typeMSHm1].numBoElem + iElemSection,
(cgsize_t*)&writeZone->zoneElemConn[typeMSHm1].connectivity[0],
-@@ -1746,9 +1747,9 @@
+@@ -1746,9 +1747,9 @@ int write_CGNS_zones(GModel &model, cons
// In the first zone
if(cg_conn_write
(cgIndexFile, cgIndexBase, zoneInfo[gCIt->first.zone1].cgIndex,
@@ -162,7 +165,7 @@
&cgIndexInterface))
{
return cgnsErr();
-@@ -1756,9 +1757,9 @@
+@@ -1756,9 +1757,9 @@ int write_CGNS_zones(GModel &model, cons
// In the second zone
if(cg_conn_write
(cgIndexFile, cgIndexBase, zoneInfo[gCIt->first.zone2].cgIndex,
@@ -174,7 +177,7 @@
&cgIndexInterface))
{
return cgnsErr();
-@@ -1878,7 +1879,7 @@
+@@ -1878,7 +1879,7 @@ int write_CGNS_zones(GModel &model, cons
}
if(cg_boco_write(cgIndexFile, cgIndexBase,
zoneInfo[zoneIndex].cgIndex, patchName.c_str(),
@@ -183,7 +186,7 @@
&cgIndexBoco))
{
return cgnsErr();
-@@ -1888,7 +1889,7 @@
+@@ -1888,7 +1889,7 @@ int write_CGNS_zones(GModel &model, cons
int normalIndex;
if(cg_boco_normal_write(cgIndexFile, cgIndexBase,
zoneInfo[zoneIndex].cgIndex, cgIndexBoco,
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=45207&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 4 20:43:47 2012
@@ -1,26 +1,32 @@
Description: Change name of shared library
Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-12-09
+Last-Update: 2012-06-20
-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 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1027,7 +1027,11 @@
# 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})
-set_target_properties(lib PROPERTIES OUTPUT_NAME Gmsh)
-+set_target_properties(lib PROPERTIES OUTPUT_NAME gmsh)
++set_target_properties(lib PROPERTIES
++ OUTPUT_NAME gmsh
++ SOVERSION "${GMSH_MAJOR_VERSION}"
++ )
++
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1027,7 +1027,7 @@
+@@ -1037,7 +1041,11 @@
# shared library target: we don't build it by default either
add_library(shared SHARED EXCLUDE_FROM_ALL ${GMSH_SRC})
-set_target_properties(shared PROPERTIES OUTPUT_NAME Gmsh)
-+set_target_properties(shared PROPERTIES OUTPUT_NAME gmsh1)
++set_target_properties(shared PROPERTIES
++ OUTPUT_NAME gmsh
++ SOVERSION "${GMSH_MAJOR_VERSION}"
++ )
++
if(HAVE_LAPACK AND LAPACK_FLAGS)
set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
endif(HAVE_LAPACK AND LAPACK_FLAGS)
Modified: packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch?rev=45207&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 4 20:43:47 2012
@@ -2,10 +2,8 @@
Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
Last-Update: 2011-12-09
-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
+--- a/Graphics/CMakeLists.txt
++++ b/Graphics/CMakeLists.txt
@@ -15,7 +15,6 @@
drawScales.cpp
drawGraph2d.cpp
@@ -14,11 +12,9 @@
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-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 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1070,7 +1070,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=45207&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 4 20:43:47 2012
@@ -2,11 +2,9 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-04-08
-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 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1069,7 +1069,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=45207&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 4 20:43:47 2012
@@ -2,10 +2,8 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
-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
+--- a/Plugin/Bubbles.cpp
++++ b/Plugin/Bubbles.cpp
@@ -30,7 +30,7 @@
{
return "Plugin(Bubbles) constructs a geometry consisting of "
@@ -15,10 +13,8 @@
"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.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
+--- a/contrib/lbfgs/alglibinternal.cpp
++++ b/contrib/lbfgs/alglibinternal.cpp
@@ -3679,8 +3679,8 @@
{
return;
@@ -41,10 +37,8 @@
/*
* beta*y
-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
+--- a/doc/texinfo/gmsh.texi
++++ b/doc/texinfo/gmsh.texi
@@ -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/pedantic.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/pedantic.patch?rev=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/pedantic.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/pedantic.patch Wed Jul 4 20:43:47 2012
@@ -1,8 +1,11 @@
-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: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 @@
+Desctiption: Removes pedantic warnings
+Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-03-11
+
+--- a/Geo/STensor3.h
++++ b/Geo/STensor3.h
+@@ -332,7 +332,7 @@
for (int j=0; j<3; j++)
temp[i]+= t(i,j)*v[j];
return temp;
@@ -11,7 +14,7 @@
inline SVector3 operator* (const SVector3& v, const STensor3& t){
SVector3 temp(0.,0.,0.);
-@@ -342,7 +342,7 @@
+@@ -340,7 +340,7 @@
for (int j=0; j<3; j++)
temp[j]+= v[i]*t(i,j);
return temp;
Modified: packages/gmsh-tetgen/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/series?rev=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/series (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/series Wed Jul 4 20:43:47 2012
@@ -5,9 +5,7 @@
switch_from_opencascade_to_oce.patch
api_demos.patch
fix_FTBFS_linking.patch
-Alauzet.patch
+cgns.patch
pedantic.patch
-cgns.patch
-add-missing-headers.patch
metis.patch
-#fix_FTBFS_gcc_4.7_bamg.patch
+alauzet.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=45207&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 4 20:43:47 2012
@@ -2,11 +2,9 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
-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 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1112,7 +1112,7 @@
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,7 +13,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/?*.*)
-@@ -1193,7 +1193,7 @@
+@@ -1207,7 +1207,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=45207&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 Wed Jul 4 20:43:47 2012
@@ -4,10 +4,8 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-02-10
-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
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -815,15 +815,6 @@
endif(HAVE_SOLVER)
Modified: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=45207&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules (original)
+++ packages/gmsh-tetgen/trunk/debian/rules Wed Jul 4 20:43:47 2012
@@ -1,24 +1,43 @@
#!/usr/bin/make -f
BUILDDIR = $(CURDIR)/debian/build
+JAVA_HOME=/usr/lib/jvm/default-java
+
+# Add --with javahelper for java-wrappers
%:
- dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 --parallel
+ dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 --with javahelper --parallel
export OMPI_MCA_plm_rsh_agent=/bin/false #workaround to start MPI-applications in chroot
+
+disable_mpi_archs = armel armhf kfreebsd-amd64 kfreebsd-i386 mips mipsel
+export LD_LIBRARY_PATH := $(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH);
extra_flags += \
-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
-Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
-DCMAKE_C_FLAGS="-fPIC -Wall $(shell dpkg-buildflags --get CFLAGS)" \
--DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
--DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7 \
-DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
-DPYTHON_LIBRARY:FILEPATH=/usr/lib/libpython2.7.so \
-DENABLE_METIS:BOOL=ON \
-DENABLE_TAUCS:BOOL=ON \
--DENABLE_MPI:BOOL=OFF \
+-DENABLE_MPI:BOOL=ON \
-DENABLE_OSMESA:BOOL=OFF \
--DENABLE_CGNS:BOOL=OFF
+-DENABLE_CGNS:BOOL=ON \
+-DENABLE_WRAP_JAVA:BOOL=ON \
+-DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
+-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
+
+ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_mpi_archs)))
+ extra_flags += \
+ -DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
+ -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
+ -DENABLE_MPI:BOOL=ON
+else
+ extra_flags += \
+ -DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -fPIC \
+ -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
+ -DENABLE_MPI:BOOL=OFF
+endif
# PETSC_DIR is the location of PETSc.
export PETSC_DIR=/usr/lib/petscdir/3.2
@@ -27,6 +46,7 @@
override_dh_auto_clean:
rm -rf $(BUILDDIR)
+ rm -rf $(CURDIR)/debian/tmp
rm -f doc/texinfo/gmsh.vr
rm -f doc/texinfo/gmsh.fn
rm -f doc/texinfo/gmsh.ky
@@ -41,6 +61,7 @@
rm -f doc/texinfo/gmsh.html
rm -f doc/texinfo/gmsh.pdf
rm -f doc/texinfo/gmsh.info
+ jh_build --clean
override_dh_auto_configure:
dh_auto_configure -- $(extra_flags)
@@ -50,6 +71,8 @@
# To avoid the texi2dvi pb add LC_ALL=C
dh_auto_build -- pdf html info LC_ALL=C
chrpath -d $(BUILDDIR)/wrappers/gmshpy/*.so
+ jh_installlibs -pjava-gmsh-tetgen -v
+ jh_depends -pjava-gmsh-tetgen -v
override_dh_auto_test:
mkdir test-dir
More information about the debian-science-commits
mailing list