[SCM] Gerris Flow Solver branch, debian-unstable, updated. gerris-0.9.2+darcs081022-dfsg.1-4-2-g2ba2f77

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit 2ba2f77bf3b2ac8ccc56dab9800120ca7716bdcd
Author: Drew Parsons <dparsons at debian.org>
Date:   Fri May 1 17:00:30 2009 +1000

    Debian: install missing files.
    
    Install usr/lib/gerris scripts into /usr/share/gerris/lib instead,
    since they are architecture independent (with symlink so gerris keeps
    working).
    
      * debian/gerris.install:
          - install usr/share contents (MIME data, gerris icons).
          - install m4 and python scripts from usr/lib/gerris into
            usr/share/gerris/lib (arch-independent files, hence install in
            usr/share).  gerris.links creates symlink from
            usr/share/gerris/lib back to usr/lib/gerris.
            gerris Depends: m4, gawk | awk
            Closes: #526424.

diff --git a/debian/changelog b/debian/changelog
index 3e6c65a..3684367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
 gerris (0.9.2+darcs081022-dfsg.1-5) UNRELEASED; urgency=low
 
   * debian/control: Place libgfs-dbg in Section: debug.
-
- -- Drew Parsons <dparsons at debian.org>  Thu, 23 Apr 2009 16:09:50 +1000
+  * debian/gerris.install: 
+      - install usr/share contents (MIME data, gerris icons).  
+      - install m4 and python scripts from usr/lib/gerris into
+        usr/share/gerris/lib (arch-independent files, hence install in
+        usr/share).  gerris.links creates symlink from
+        usr/share/gerris/lib back to usr/lib/gerris.
+        gerris Depends: m4, gawk | awk
+        Closes: #526424.
+
+ -- Drew Parsons <dparsons at debian.org>  Fri, 01 May 2009 17:10:55 +1000
 
 gerris (0.9.2+darcs081022-dfsg.1-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index de5dd9b..c462365 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gerris.git/.git
 
 Package: gerris
 Architecture: any
-Depends: libgfs-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: libgfs-dev, m4, gawk | awk, ${shlibs:Depends}, ${misc:Depends}
 Description: Gerris Flow Solver
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
diff --git a/debian/gerris.install b/debian/gerris.install
index 451ddc0..7462e21 100644
--- a/debian/gerris.install
+++ b/debian/gerris.install
@@ -1 +1,3 @@
 debian/tmp/usr/bin
+debian/tmp/usr/lib/gerris/* usr/share/gerris/lib
+debian/tmp/usr/share
diff --git a/debian/gerris.links b/debian/gerris.links
new file mode 100644
index 0000000..26d5dbb
--- /dev/null
+++ b/debian/gerris.links
@@ -0,0 +1 @@
+usr/share/gerris/lib usr/lib/gerris

-- 
Gerris Flow Solver