[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 65a8743cab2755e87ec952b985a08f2566d97109
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Dec 28 10:39:56 2009 +1100

    place conflict between mpi and non-mpi builds
    
    They currently use the same files, so can't be installed simultaneously.
    
    Should probably figure out a way of installing both version side by
    side.  gromacs does it, but it only has special "mdrun_mpi" binaries,
    so no actual conflict.  Maybe rename to "gerris2D_mpi" or something?

diff --git a/debian/changelog b/debian/changelog
index 420bf8c..921478c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,11 @@ gerris (20091109-dfsg.1-2) UNRELEASED; urgency=low
   * Remove get-orig-source target from debian/rules; gerris has
     nonfree code which needs to be removed from the upstream tarball
     anyway.
+  * Introduction of new packages with MPI support. Currently conflicts
+    with single processor builds (i.e. install one or the other, can't
+    install simultaneously).
 
- -- Drew Parsons <dparsons at debian.org>  Sun, 27 Dec 2009 15:47:20 +1100
+ -- Drew Parsons <dparsons at debian.org>  Mon, 28 Dec 2009 10:38:00 +1100
 
 gerris (20091109-dfsg.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a261723..b07704b 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,8 @@ Description: Gerris Flow Solver
    * Flexible specification of additional source terms
    * Portable parallel support using the MPI library
    * Volume of Fluid advection scheme for interfacial flows 
+ .
+ For multi-cpu MPI support, install gerris-mpi instead.
 
 Package: libgfs-dev
 Architecture: any
@@ -67,6 +69,8 @@ Description: Gerris Flow Solver -- shared libraries
 Package: gerris-mpi
 Architecture: any
 Depends: libgfs-mpi-dev, m4, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: gerris
+Replaces: gerris
 Description: Gerris Flow Solver
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
@@ -90,6 +94,8 @@ Package: libgfs-mpi-dev
 Architecture: any
 Section: libdevel
 Depends: libgfs-mpi-1.3-1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libgfs-dev
+Replaces: libgfs-dev
 Description: Gerris Flow Solver -- development libraries and headers
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
@@ -104,6 +110,8 @@ Package: libgfs-mpi-1.3-1
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libgfs-1.3-1
+Replaces: libgfs-1.3-1
 Description: Gerris Flow Solver -- shared libraries
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.

-- 
Gerris Flow Solver