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

[Anton Gladky]

The following commit has been merged in the gmsh-tetgen branch:
commit f35ded97ed8741e1a04b20a73bfd67590be7e394
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Jun 28 20:08:36 2012 +0200

    Add java-wrapper.

diff --git a/debian/changelog b/debian/changelog
index 57ec480..918396b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,7 +55,6 @@ gmsh (2.5.1~beta2~svn12143~dfsg-1) unstable; urgency=low
   * [ba6f120] Fix FTBFS against gcc-4.7 (bamg-library).
 
  -- Anton Gladky <gladky.anton at gmail.com>  Thu, 24 May 2012 22:06:11 +0200
->>>>>>> master
 
 gmsh (2.5.1~beta2~svn11845~dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 248bd0f..2b9a1ad 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
  python (>= 2.7), python (<<2.8), libgmsh2
 Recommends: gmsh-doc
+Replaces: gmsh-doc
 Description: Three-dimensional finite element mesh generator
  Gmsh is an automatic 3D finite element mesh generator (primarily
  Delaunay) with build-in CAD and post-processing facilities. Its
@@ -104,3 +105,47 @@ Description: Three-dimensional finite element mesh generator. Documentation
  .
  See Gmsh's reference manual for a more thorough overview of Gmsh's
  capabilities.
+ 
+Package: python-gmsh-tetgen
+Section: python
+Architecture: any
+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: jave-gmsh-tetgen
+Section: python
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
+ python (>= 2.7), python (<<2.8)
+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
diff --git a/debian/gmsh-tetgen.doc-base b/debian/gmsh-tetgen.doc-base
deleted file mode 100644
index 1eb62cd..0000000
--- a/debian/gmsh-tetgen.doc-base
+++ /dev/null
@@ -1,12 +0,0 @@
-Document: gmsh-tetgen
-Title: Gmsh Reference Manual (Tetgen version)
-Author: Christophe Geuzaine and Jean-François Remacle
-Abstract: This is the reference manual for gmsh-tetgen.
-Section: Science/Mathematics
-
-Format: pdf
-Files: /usr/share/doc/gmsh-tetgen/gmsh.pdf.gz
-
-Format: HTML
-Index: /usr/share/doc/gmsh-tetgen/gmsh.html
-Files: /usr/share/doc/gmsh-tetgen/gmsh.html
diff --git a/debian/gmsh-tetgen.docs b/debian/gmsh-tetgen.docs
deleted file mode 100644
index 685c212..0000000
--- a/debian/gmsh-tetgen.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-utils/converters
-utils/solvers
-utils/api_demos
diff --git a/debian/java-gmsh-tetgen.install b/debian/java-gmsh-tetgen.install
new file mode 100644
index 0000000..09e3f68
--- /dev/null
+++ b/debian/java-gmsh-tetgen.install
@@ -0,0 +1 @@
+debian/build/wrappers/java/libWrapGmsh.so usr/lib
diff --git a/debian/java-gmsh-tetgen.libs b/debian/java-gmsh-tetgen.libs
new file mode 100644
index 0000000..37f1543
--- /dev/null
+++ b/debian/java-gmsh-tetgen.libs
@@ -0,0 +1 @@
+debian/build/wrappers/java/WrappingJava/WrapGmsh.jar
diff --git a/debian/patches/series b/debian/patches/series
index d341aee..a0ca214 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ cgns.patch
 pedantic.patch
 metis.patch
 alauzet.patch
-add-missing-headers.patch
diff --git a/debian/gmsh-tetgen.pyinstall b/debian/python-gmsh-tetgen.pyinstall
similarity index 100%
rename from debian/gmsh-tetgen.pyinstall
rename to debian/python-gmsh-tetgen.pyinstall
diff --git a/debian/rules b/debian/rules
index 16dde27..6d4d419 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,11 @@
 #!/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
 
@@ -20,6 +23,7 @@ extra_flags += \
 -DENABLE_MPI:BOOL=ON \
 -DENABLE_OSMESA:BOOL=OFF \
 -DENABLE_CGNS:BOOL=OFF \
+-DENABLE_WRAP_JAVA:BOOL=ON \
 -DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
 -DCMAKE_INSTALL_PREFIX:STRING="/usr" \
 
@@ -57,6 +61,7 @@ override_dh_auto_clean:
 	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)
@@ -66,6 +71,8 @@ override_dh_auto_build:
 	# 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

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