[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, gmsh-tetgen, updated. debian/2.6.0.dfsg-2-20-gd3d918e

[Anton Gladky]

The following commit has been merged in the gmsh-tetgen branch:
commit a64757347d6ec530c933648de587811e6b51197b
Merge: 9c763787cc45a9d4ce68917ed9de1e3aaebfc066 ace51e2925a0d3ce3e0444c5ff96996306ee3f12
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Jun 24 17:43:45 2012 +0200

    Merge with master.

diff --combined debian/control
index 248bd0f,92e3531..9d1a795
--- a/debian/control
+++ b/debian/control
@@@ -1,4 -1,4 +1,4 @@@
 -Source: gmsh
 +Source: gmsh-tetgen
  Section: math
  Priority: optional
  Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
@@@ -26,7 -26,7 +26,7 @@@ Vcs-Git: git://git.debian.org/git/debia
  Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gmsh.git
  Homepage: http://www.geuz.org/gmsh/
  
 -Package: gmsh
 +Package: gmsh-tetgen
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
   python (>= 2.7), python (<<2.8), libgmsh2
@@@ -46,7 -46,7 +46,7 @@@ Description: Three-dimensional finite e
   See Gmsh's reference manual for a more thorough overview of Gmsh's
   capabilities.
  
 -Package: libgmsh2
 +Package: libgmsh2-tetgen
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
   python (>= 2.7), python (<<2.8)
@@@ -65,7 -65,7 +65,7 @@@ Description: Three-dimensional finite e
   See Gmsh's reference manual for a more thorough overview of Gmsh's
   capabilities.
  
 -Package: libgmsh-dev
 +Package: libgmsh-tetgen-dev
  Architecture: all
  Section: libdevel
  Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
@@@ -85,7 -85,7 +85,7 @@@ Description: Three-dimensional finite e
   See Gmsh's reference manual for a more thorough overview of Gmsh's
   capabilities.
  
 -Package: gmsh-doc
 +Package: gmsh-tetgen-doc
  Section: doc
  Architecture: all
  Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
@@@ -104,3 -104,49 +104,49 @@@ Description: Three-dimensional finite e
   .
   See Gmsh's reference manual for a more thorough overview of Gmsh's
   capabilities.
+  
+ Package: python-gmsh
+ Section: python
+ Architecture: all
+ Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
+  python (>= 2.7), python (<<2.8)
+ 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.
+  .
+  This package contains the python wrappers for gmsh
+  
+ Package: java-gmsh
+ Section: java
+ Architecture: all
+ Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
+  python (>= 2.7), python (<<2.8)
+ 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.
+  .
+  This package contains the Java wrappers for gmsh
+  
+  
diff --combined debian/rules
index 16dde27,029a352..e98ca56
--- a/debian/rules
+++ b/debian/rules
@@@ -1,5 -1,8 +1,8 @@@
  #!/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
@@@ -10,16 -13,14 +13,17 @@@ disable_mpi_archs = armel armhf kfreebs
  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)" \
  -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
  -DPYTHON_LIBRARY:FILEPATH=/usr/lib/libpython2.7.so \
 --DENABLE_METIS:BOOL=OFF \
 --DENABLE_TAUCS:BOOL=OFF \
 +-DENABLE_METIS:BOOL=ON \
 +-DENABLE_TAUCS:BOOL=ON \
 +-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" \
  

-- 
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator.