[SCM] Gerris Flow Solver branch, debian-unstable, updated. gerris-20091109-dfsg.1-1-15-gc1377bf

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit 8b6e59dda172e040e8cb1e994810854624eb86f0
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Dec 28 10:18:18 2009 +1100

    create mpi binary packages
    
    libgfs-dbg is now in a grey area - it gets the MPI versions. Rename, or?

diff --git a/debian/control b/debian/control
index 497eaf8..a261723 100644
--- a/debian/control
+++ b/debian/control
@@ -63,3 +63,52 @@ Description: Gerris Flow Solver -- shared libraries
  equations describing fluid flow.
  .
  This package contains the shared libraries for libgfs.
+
+Package: gerris-mpi
+Architecture: any
+Depends: libgfs-mpi-dev, m4, ${shlibs:Depends}, ${misc:Depends}
+Description: Gerris Flow Solver
+ Gerris is a system for the solution of the partial differential
+ equations describing fluid flow.
+ .
+ A brief summary of its main (current) features:
+ .
+   * Solves the time-dependent incompressible variable-density Euler, 
+     Stokes or Navier-Stokes equations
+   * Adaptive mesh refinement: the resolution is adapted dynamically to 
+     the features of the flow
+   * Entirely automatic mesh generation in complex geometries
+   * Second-order in space and time
+   * Unlimited number of advected/diffused passive tracers
+   * Flexible specification of additional source terms
+   * Portable parallel support using the MPI library
+   * Volume of Fluid advection scheme for interfacial flows 
+ .
+ This package has MPI support built in.
+
+Package: libgfs-mpi-dev
+Architecture: any
+Section: libdevel
+Depends: libgfs-mpi-1.3-1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Gerris Flow Solver -- development libraries and headers
+ Gerris is a system for the solution of the partial differential
+ equations describing fluid flow.
+ .
+ This package contains the headers and development libraries needed to
+ build applications using libgfs.
+ .
+ This package has MPI support built in.
+
+
+Package: libgfs-mpi-1.3-1
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Gerris Flow Solver -- shared libraries
+ Gerris is a system for the solution of the partial differential
+ equations describing fluid flow.
+ .
+ This package contains the shared libraries for libgfs.
+ .
+ This package has MPI support built in.
+
diff --git a/debian/gerris.docs b/debian/gerris-mpi.docs
similarity index 100%
copy from debian/gerris.docs
copy to debian/gerris-mpi.docs
diff --git a/debian/gerris-mpi.install b/debian/gerris-mpi.install
new file mode 100644
index 0000000..224ed7c
--- /dev/null
+++ b/debian/gerris-mpi.install
@@ -0,0 +1,5 @@
+usr/bin
+usr/lib/gerris/gfs2tex.py usr/share/gerris/lib
+usr/lib/gerris/m4.awk usr/share/gerris/lib
+usr/lib/gerris/libstokes*
+usr/share
diff --git a/debian/gerris.links b/debian/gerris-mpi.links
similarity index 100%
copy from debian/gerris.links
copy to debian/gerris-mpi.links
diff --git a/debian/libgfs-mpi-1.3-1.install b/debian/libgfs-mpi-1.3-1.install
new file mode 100644
index 0000000..f254415
--- /dev/null
+++ b/debian/libgfs-mpi-1.3-1.install
@@ -0,0 +1 @@
+usr/lib/libgfs*.so.*
diff --git a/debian/libgfs-mpi-dev.install b/debian/libgfs-mpi-dev.install
new file mode 100644
index 0000000..e506fa9
--- /dev/null
+++ b/debian/libgfs-mpi-dev.install
@@ -0,0 +1,5 @@
+usr/include
+usr/lib/libgfs*.so
+usr/lib/libgfs*.la
+usr/lib/libgfs*.a
+usr/lib/pkgconfig/gerris*.pc
diff --git a/debian/rules b/debian/rules
index 944e0f6..ce8354f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,13 @@ override_dh_auto_install:
 # don't need to install darcs2dist or gfs2doc
 # see bug#436240 for my opinion on the sensibleness of this
 override_dh_install:
-	dh_install --exclude=darcs2dist
+	dh_install -pgerris --exclude=darcs2dist
+	dh_install -plibgfs-1.3-1
+	dh_install -plibgfs-dev
+# dh_install can't figure out the mpi install dirs on its own, so use --sourcedir
+	dh_install -pgerris-mpi --sourcedir=debian/tmp-mpi --exclude=darcs2dist
+	dh_install -plibgfs-mpi-1.3-1 --sourcedir=debian/tmp-mpi
+	dh_install -plibgfs-mpi-dev   --sourcedir=debian/tmp-mpi
 
 override_dh_strip:
 	dh_strip --dbg-package=libgfs-dbg

-- 
Gerris Flow Solver