[SCM] WorldForge terrain library branch, master, updated. upstream/0.3.0-16-g14b0c65

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 836fb0b9bbf2961ca966369992f3040ef596971b
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Sun Feb 26 11:51:11 2012 -0500

    debian/copyright: clarified distribution license
    
    Clarified the distribution license terms are GPL-2 only, after consultation with
    upstream.

diff --git a/debian/copyright b/debian/copyright
index 9658885..2aaf939 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,22 +5,25 @@ Files: *
 Copyright: 2003-2010 Alistair Riddoch <alriddoch at googlemail.com>
            2003-2004 Damien McGinnes <mcginnes at netspeed.com.au>
            2004      Ron Steinke
-License: GPL-2+
+License: GPL-2
+Comment: The distribution license of this software is not explicitly clear
+ in the upstream tarball.  Alistair Riddoch has additionally clarified in personal
+ correspondence that "Mercator ... is distributed under the GNU General Public
+ License version 2 only."
 
-Files: test/util_timer.*
+Files: tests/util_timer.*
 Copyright: 2002      Jari Sundell
-License: GPL-2+
+License: GPL-2
 
 Files: debian/*
 Copyright: 2002 Michael Koch <konqueror at gmx.de>
            2012 Stephen M. Webb <stephen.webb at bregmasoft.ca>
-License: GPL-2+
+License: GPL-2
 
-License: GPL-2+
+License: GPL-2
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ it under the terms of version 2 of the GNU General Public License as
+ published by the Free Software Foundation.
  .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of

-- 
WorldForge terrain library