r45501 - in /packages/gmsh-tetgen/trunk/debian: control gmsh-tetgen.docs patches/alauzet.patch rules

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Wed Jan  9 11:51:42 2013
New Revision: 45501

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45501
Log:
update alauzet.patch for rev >=  14375

Removed:
    packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.docs
Modified:
    packages/gmsh-tetgen/trunk/debian/control
    packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch
    packages/gmsh-tetgen/trunk/debian/rules

Modified: packages/gmsh-tetgen/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/control?rev=45501&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/control (original)
+++ packages/gmsh-tetgen/trunk/debian/control Wed Jan  9 11:51:42 2013
@@ -11,14 +11,14 @@
  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 (>= 2.5.5),
  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],
+ libhdf5-mpi-dev (>= 1.8.4) [alpha amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc],
  libblas-dev, liblapack-dev, libgl2ps-dev, freeglut3-dev,
  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],
+ libpetsc3.1-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
+ libslepc3.1-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
  javahelper, default-jdk
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes
@@ -136,26 +136,26 @@
  .
  This package contains the python wrappers for gmsh
  
-Package: libjava-gmsh2-tetgen
-Section: java
-Architecture: any
-Replaces: libjava-gmsh2
-Provides: libjava-gmsh2
-Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre,
- libgmsh2-tetgen
-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
+#Package: libjava-gmsh2-tetgen
+#Section: java
+#Architecture: any
+#Replaces: libjava-gmsh2
+#Provides: libjava-gmsh2
+#Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre,
+# libgmsh2-tetgen
+#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/patches/alauzet.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch?rev=45501&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch Wed Jan  9 11:51:42 2013
@@ -231,7 +231,7 @@
 ===================================================================
 --- gmsh-tetgen-2.5.1~beta2~svn12051.orig/Geo/STensor3.cpp	2012-05-10 21:50:43.000000000 +0200
 +++ gmsh-tetgen-2.5.1~beta2~svn12051/Geo/STensor3.cpp	2012-05-10 21:53:21.439618616 +0200
-@@ -38,6 +38,27 @@
+@@ -82,6 +82,27 @@
    return iv;
  }
  

Modified: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=45501&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules (original)
+++ packages/gmsh-tetgen/trunk/debian/rules Wed Jan  9 11:51:42 2013
@@ -6,6 +6,8 @@
 
 # Add --with javahelper for java-wrappers
 
+#%:
+#	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 --with javahelper --parallel
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 --with javahelper --parallel
 
@@ -45,9 +47,9 @@
 endif
 
 # PETSC_DIR is the location of PETSc.
-export PETSC_DIR=/usr/lib/petscdir/3.2
+export PETSC_DIR=/usr/lib/petscdir/3.1
 export PETSC_ARCH=linux-gnu-c-opt
-export SLEPC_DIR=/usr/lib/slepcdir/3.2
+export SLEPC_DIR=/usr/lib/slepcdir/3.1
 
 override_dh_auto_clean:
 	rm -rf $(BUILDDIR)
@@ -81,8 +83,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
+	#jh_installlibs -pjava-gmsh-tetgen -v
+	#h_depends -pjava-gmsh-tetgen -v
 
 override_dh_auto_test:
 	mkdir test-dir