[SCM] WorldForge terrain library branch, master, updated. upstream/0.3.0-12-g3fd8495

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit f3b437f13dcb88ef1fb6c77b5518854dc9c9a603
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Tue Jan 31 10:46:41 2012 -0500

    debian/copyright: convert to DEP-5 format

diff --git a/debian/changelog b/debian/changelog
index 989b49c..c0c843b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ mercator (0.3.0-1) UNRELEASED; urgency=low
   * updated Standards-Version to 3.9.2 (no changes required)
   * debian/control: added Vcs- fields
   * added symbols tracking
+  * debian/copyright: convert to DEP-5 format
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Fri, 06 Jan 2012 14:43:56 -0500
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Tue, 31 Jan 2012 10:45:48 -0500
 
 mercator (0.2.7-3) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index d4de3e7..9658885 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,31 +1,35 @@
-This package was debianized by Michael Koch <konqueror at gmx.de> on
-Sat, 15 May 2004 15:36:54 +0200.
-
-It was downloaded from ftp://ftp.worldforge.org/pub/worldforge/libs/mercator.
-
-Upstream Authors: Al Riddoch <alriddoch at zepler.org>
-		  Damien McGinnes <mcginnes at netspeed.com.au>
-		  and others.
-
-Copyright: (C) 2004 - 2008 Al Riddoch <alriddoch at zepler.org>
-                           Damien McGinnes <mcginnes at netspeed.com.au>
-                           and others.
-
-License:
-
-    This package 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.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Source: https://github.com/worldforge/mercator
+
+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+
+
+Files: test/util_timer.*
+Copyright: 2002      Jari Sundell
+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+
+ 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.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file `/usr/share/common-licenses/GPL-2'.

-- 
WorldForge terrain library