[SCM] Gerris Flow Solver branch, debian-unstable, updated. gerris-0.9.2+darcs081022-dfsg.1-5-82-g44c5104

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit 0e3b48790362da1d7138f7844788bfcab32281e5
Author: Drew Parsons <dparsons at debian.org>
Date:   Sun Jun 7 23:51:48 2009 +1000

    Debian: installation of /usr/lib/gerris: arch-dep (libstokes) and -indep
    
    Now that the stokes module is built (libstokes), /usr/lib/gerris
    contains both arch-dep files (libstokes) and arch-indep (m4.awk,
    gfs2tex.py).  So instead of making /usr/lib/gerris a symlink to
    /usr/share/gerris/lib, it must now be a real directory.  The arch-dep
    files in /usr/share/gerris/lib must be individually symlinked back to
    /usr/lib/gerris.
    
    debian/gerris.preinstall handles the deletion of the former symlink
    /usr/lib/gerris from earlier versions.
    
    Also, in debian/rules, set DEB_DH_INSTALL_ARGS = --list-missing to
    list any files which are installed by upstream but not packaged in debs.
    (However this does not collate across all deb packages, so may not
    prove very useful in practice).

diff --git a/debian/changelog b/debian/changelog
index 13a8a1b..5f4ca40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,13 @@ gerris (20090512-dfsg.1-1) UNRELEASED; urgency=low
       	(see http://polar.ncep.noaa.gov/waves/wavewatch/wavewatch.html )
       - stokes: CW263.f confirmed by the author to be available in the
       	public domain. 
+  * With provision of the stokes module, /usr/lib/gerris now contains both
+    arch dependent files (libstokes) and arch indep (m4.awk,
+    gfs2tex.py), installed at /usr/share/gerris/lib.  /usr/lib/gerris 
+    is therefore no longer a symlink to /usr/share/gerris/lib, unlike
+    earlier revisions.
 
- -- Drew Parsons <dparsons at debian.org>  Wed, 03 Jun 2009 14:51:42 +1000
+ -- Drew Parsons <dparsons at debian.org>  Sun, 07 Jun 2009 23:57:42 +1000
 
 gerris (0.9.2+darcs081022-dfsg.1-5) unstable; urgency=low
 
diff --git a/debian/gerris.install b/debian/gerris.install
index 7462e21..f3816dd 100644
--- a/debian/gerris.install
+++ b/debian/gerris.install
@@ -1,3 +1,5 @@
 debian/tmp/usr/bin
-debian/tmp/usr/lib/gerris/* usr/share/gerris/lib
+debian/tmp/usr/lib/gerris/gfs2tex.py usr/share/gerris/lib
+debian/tmp/usr/lib/gerris/m4.awk usr/share/gerris/lib
+debian/tmp/usr/lib/gerris/libstokes*
 debian/tmp/usr/share
diff --git a/debian/gerris.links b/debian/gerris.links
index 26d5dbb..44f171f 100644
--- a/debian/gerris.links
+++ b/debian/gerris.links
@@ -1 +1,2 @@
-usr/share/gerris/lib usr/lib/gerris
+usr/share/gerris/lib/gfs2tex.py  	usr/lib/gerris/gfs2tex.py
+usr/share/gerris/lib/m4.awk  		usr/lib/gerris/m4.awk
diff --git a/debian/gerris.preinst b/debian/gerris.preinst
new file mode 100644
index 0000000..dada8d2
--- /dev/null
+++ b/debian/gerris.preinst
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+# From version 20090512-dfsg.1-1, there are both arch-dependent and 
+# arch-independent files in upstream's /usr/lib/gerris (with module libstokes
+# added), so can no longer take /usr/lib/gerris as a symlink to 
+# /usr/share/gerris/lib.
+if [ "$1" = "upgrade" ]; then
+    if dpkg --compare-versions "$2" lt-nl 20090512-dfsg.1-1; then
+	if [ -L /usr/lib/gerris ]; then
+		echo "Removing deprecated symlink /usr/lib/gerris"
+		rm /usr/lib/gerris
+	fi
+    fi
+fi
+
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index aba97ac..4bf6c3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --disable-mpi
 
+DEB_DH_INSTALL_ARGS = --list-missing 
+
 clean::
 	rm -f a.out
 	rm -f doc/examples/gfs.lang

-- 
Gerris Flow Solver