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

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit 6ddccf53d63fbb60eb5cd35389f6545e72cd5dcd
Author: Drew Parsons <dparsons at debian.org>
Date:   Wed Jun 3 14:53:20 2009 +1000

    modules/stokes: CW263.f is public domain.
    
    stokes: CW263.f confirmed by the author to be available in the public
    domain, see http://lists.debian.org/debian-science/2009/06/msg00001.html
    
    debian/copyright updated.

diff --git a/debian/changelog b/debian/changelog
index 7a93a13..13a8a1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ gerris (20090512-dfsg.1-1) UNRELEASED; urgency=low
   * debian/copyright lists licences for modules:
       - wavewatch: public domain
       	(see http://polar.ncep.noaa.gov/waves/wavewatch/wavewatch.html )
+      - stokes: CW263.f confirmed by the author to be available in the
+      	public domain. 
 
- -- Drew Parsons <dparsons at debian.org>  Tue, 26 May 2009 19:00:15 +1000
+ -- Drew Parsons <dparsons at debian.org>  Wed, 03 Jun 2009 14:51:42 +1000
 
 gerris (0.9.2+darcs081022-dfsg.1-5) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 4f13b19..e58a6c7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -43,7 +43,8 @@ is licensed under the GPL, see above.
 Modules
 =======
 
-Separate modules containing third-party source are found in the modules source subdir.
+Separate modules containing third-party source are found in the modules source 
+subdir.
 
 modules/wavewatch:
 -----------------
@@ -59,11 +60,26 @@ WAVEWATCH-III is public domain software.
 See http://polar.ncep.noaa.gov/waves/wavewatch/wavewatch.html
 
 
+modules/stokes.mod:
+------------------
+
+The stokes module uses cw260 and kmts, found in CW263.f written by 
+Prof. John Chaplin, School of Civil Engineering & the Environment,
+University of Southampton, UK, j.r.chaplin at soton.ac.uk.  
+
+CW263.f is found at 
+http://www.civil.soton.ac.uk/hydraulics/download/downloadtable.htm and is 
+offered by Prof. Chaplin as part of the Public Domain, with acknowledgement 
+that the author is not responsible for the consequences of any errors.
+Clarification of these conditions was made at 
+http://lists.debian.org/debian-science/2009/06/msg00001.html.
+
+
 modules/RStarTree:
 -----------------
 
-A DFSG-free software licence is not available for RStarTree, and it has therefore 
-been removed from the Debian source tarball.
+A DFSG-free software licence is not available for RStarTree, and it has 
+therefore been removed from the Debian source tarball.
 
 Consequently the modules using RStarTree are not built. 
 This includes the terrain module and the module binaries xyz2rsurface, 

-- 
Gerris Flow Solver