r45225 - in /packages/gmsh-tetgen/trunk/debian: control patches/Alauzet.patch patches/alauzet.patch patches/series rules

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

Author: trophime-guest
Date: Tue Jul 10 08:45:39 2012
New Revision: 45225

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45225
Log:
some minor fixes

Added:
    packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch
      - copied unchanged from r45207, packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch
Removed:
    packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch
Modified:
    packages/gmsh-tetgen/trunk/debian/control
    packages/gmsh-tetgen/trunk/debian/patches/series
    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=45225&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/control (original)
+++ packages/gmsh-tetgen/trunk/debian/control Tue Jul 10 08:45:39 2012
@@ -115,7 +115,8 @@
 Replaces: python-gmsh
 Provides: python-gmsh
 Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
- python (>= 2.7), python (<<2.8)
+ python (>= 2.7), python (<<2.8),
+ libgmsh2-tetgen
 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
@@ -134,11 +135,12 @@
  This package contains the python wrappers for gmsh
  
 Package: java-gmsh-tetgen
-Section: python
+Section: java
 Architecture: any
 Replaces: java-gmsh
 Provides: java-gmsh
-Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre
+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

Modified: packages/gmsh-tetgen/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/series?rev=45225&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/series (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/series Tue Jul 10 08:45:39 2012
@@ -5,7 +5,7 @@
 switch_from_opencascade_to_oce.patch
 api_demos.patch
 fix_FTBFS_linking.patch
-cgns.patch
+#cgns.patch
 pedantic.patch
 metis.patch
 alauzet.patch

Modified: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=45225&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules (original)
+++ packages/gmsh-tetgen/trunk/debian/rules Tue Jul 10 08:45:39 2012
@@ -22,7 +22,7 @@
 -DENABLE_TAUCS:BOOL=ON \
 -DENABLE_MPI:BOOL=ON \
 -DENABLE_OSMESA:BOOL=OFF \
--DENABLE_CGNS:BOOL=ON \
+-DENABLE_CGNS:BOOL=OFF \
 -DENABLE_WRAP_JAVA:BOOL=ON \
 -DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
 -DCMAKE_INSTALL_PREFIX:STRING="/usr" \
@@ -85,3 +85,22 @@
 	cd test-dir; $(BUILDDIR)/gmsh transfinite.geo -3 -o transfinite3d.stl
 	cd test-dir; ls -ln;
 	rm -rf test-dir
+
+override_dh_shlibdeps:
+	dh_makeshlibs
+	dh_shlibdeps -Llibgmsh2-tetgen -l/usr/lib
+
+# Grab the version before +dfsg
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/-[^-]*$$//')
+
+get-orig-source:
+	set -ex ; \
+        mkdir -p tmp ; \
+        uscan --force-download --symlink --check-dirname-level 0 --destdir tmp ; \
+        tar -C tmp -xzf tmp/gmsh-$(DEB_UPSTREAM_VERSION)-source.tgz ; \
+        mv tmp/gmsh-$(DEB_UPSTREAM_VERSION)-source tmp/gmsh-tetgen-$(DEB_UPSTREAM_VERSION) ; \
+        GZIP=-9 tar -C tmp -czf \
+            $(CURDIR)/gmsh-tetgen_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
+            gmsh-tetgen-$(DEB_UPSTREAM_VERSION) ; \
+        rm -rf tmp