[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 c1377bfae9e8ae551a21539d33d6d78766aacf2a
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Dec 28 14:02:20 2009 +1100

    make conflict between mpi/nonmpi packages symmetric
    
    Allows mpi and non-mpi versions to freely replace each other (making
    it easier for users until simultaneous installation is resolved).
    
    Have to specify "dh_shlibdeps -pgerris -Llibgfs-1.3-2" for gerris, or
    else it pulls in a dependency on libgfs-mpi-1.3-2.
    
    Note that libgfs-1.3-1 should have been bumped to libgfs-1.3-2 at
    v20090512-dfsg.1-1.  Lintian missed the soname bump at the time.

diff --git a/debian/control b/debian/control
index 3655675..a019ce1 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,8 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gerris.git/.git
 Package: gerris
 Architecture: any
 Depends: libgfs-dev, m4, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: gerris-mpi
+Replaces: gerris-mpi
 Suggests: python
 Description: Gerris Flow Solver
  Gerris is a system for the solution of the partial differential
@@ -39,6 +41,8 @@ Package: libgfs-dev
 Architecture: any
 Section: libdevel
 Depends: libgfs-1.3-2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libgfs-mpi-dev
+Replaces: libgfs-mpi-dev
 Description: Gerris Flow Solver -- development libraries and headers
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
@@ -61,6 +65,8 @@ Package: libgfs-1.3-2
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libgfs-mpi-1.3-2, libgfs-1.3-1 (>=20090512-dfsg.1-1)
+Replaces: libgfs-mpi-1.3-2, libgfs-1.3-1 (>=20090512-dfsg.1-1)
 Description: Gerris Flow Solver -- shared libraries
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
diff --git a/debian/rules b/debian/rules
index ac9992f..2a154bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,11 +30,12 @@ override_dh_auto_clean:
 	dh_auto_clean --builddirectory=$(BUILDDIR)
 	dh_auto_clean --builddirectory=$(BUILDDIR_MPI)
 	for bdir in $(BUILDDIR) $(BUILDDIR_MPI); do    \
-	rm $$bdir/doc/examples/gerris.dic  || true;    \
-	rm $$bdir/doc/examples/gfs.lang    || true;    \
-	rm $$bdir/src/modules.c            || true;    \
-	rm $$bdir/src/modules.h            || true;    \
+	   rm $$bdir/doc/examples/gerris.dic  || true;    \
+	   rm $$bdir/doc/examples/gfs.lang    || true;    \
+	   rm $$bdir/src/modules.c            || true;    \
+	   rm $$bdir/src/modules.h            || true;    \
 	done
+	-rm doc/examples/gfs2tex.pyc
 
 override_dh_auto_build:
 	dh_auto_build --builddirectory=$(BUILDDIR)
@@ -61,3 +62,14 @@ override_dh_installchangelogs:
 override_dh_strip:
 	dh_strip --dbg-package=libgfs-dbg
 
+# gerris will pick up a dependency on libgfs-mpi-1.3-2
+# unless we specific -Llibgfs-1.3-2 here
+override_dh_shlibdeps:
+	dh_shlibdeps -pgerris -Llibgfs-1.3-2
+	dh_shlibdeps -plibgfs-1.3-2
+	dh_shlibdeps -plibgfs-dev
+	dh_shlibdeps -pgerris-mpi -Llibgfs-mpi-1.3-2
+	dh_shlibdeps -plibgfs-mpi-1.3-2
+	dh_shlibdeps -plibgfs-mpi-dev
+	dh_shlibdeps -plibgfs-dbg
+

-- 
Gerris Flow Solver