[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 725961938c8e524f289ad96d35dcdb45e1e3ee2e
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Jun 27 20:19:43 2012 +0200

    Fix package building.

diff --git a/debian/changelog b/debian/changelog
index 918396b..57ec480 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,7 @@ 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 9d1a795..248bd0f 100644
--- a/debian/control
+++ b/debian/control
@@ -104,49 +104,3 @@ 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
-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 --git a/debian/gmsh-tetgen.doc-base b/debian/gmsh-tetgen.doc-base
new file mode 100644
index 0000000..1eb62cd
--- /dev/null
+++ b/debian/gmsh-tetgen.doc-base
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..685c212
--- /dev/null
+++ b/debian/gmsh-tetgen.docs
@@ -0,0 +1,3 @@
+utils/converters
+utils/solvers
+utils/api_demos
diff --git a/debian/gmsh-tetgen.install b/debian/gmsh-tetgen.install
index 1dd6ec5..21bbf52 100644
--- a/debian/gmsh-tetgen.install
+++ b/debian/gmsh-tetgen.install
@@ -1,3 +1,3 @@
 debian/*.xpm /usr/share/pixmaps
-debian/*.desktop /usr/share/applications
+debian/gmsh.desktop /usr/share/applications
 usr/bin
diff --git a/debian/python-gmsh-tetgen.pyinstall b/debian/gmsh-tetgen.pyinstall
similarity index 100%
rename from debian/python-gmsh-tetgen.pyinstall
rename to debian/gmsh-tetgen.pyinstall
diff --git a/debian/java-gmsh.install b/debian/java-gmsh.install
deleted file mode 100644
index 4b114fc..0000000
--- a/debian/java-gmsh.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/build/wrappers/java/*.so gmshpy
-debian/build/wrappers/java/*.py gmshpy
diff --git a/debian/rules b/debian/rules
index e98ca56..16dde27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
 #!/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
@@ -22,8 +19,7 @@ extra_flags += \
 -DENABLE_TAUCS:BOOL=ON \
 -DENABLE_MPI:BOOL=ON \
 -DENABLE_OSMESA:BOOL=OFF \
--DENABLE_CGNS:BOOL=ON \
--DENABLE_WRAP_JAVA:BOOL=ON \
+-DENABLE_CGNS:BOOL=OFF \
 -DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
 -DCMAKE_INSTALL_PREFIX:STRING="/usr" \
 

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