[SCM] gmt branch, master, updated. upstream/4.5.5-13-g2b12d98

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 2b12d98e743f13b1bc080b4bbe5e8126c5aedc2b
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Mar 7 12:46:22 2012 +0100

    Copyright file revised for new format 1.0

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 4d88689..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,16 +0,0 @@
-Debian GMT (Generic Mapping Tools) upstream tarball creation
-------------------------------------------------------------
-
-Currently you need to get all required archives by running 
-
-  debian/rules download-upstream
-
-which should download the upstream packages for you. After that, building a 
-local package works as expected. To build an official package, first
-create an orig.tar.gz file from just the upstream folder using
-
-  debian/rules create-orig-tar
-
-After that you need to commit upstream stuff in svn in order to use 
-svn-buildpackage successfully.
-
diff --git a/debian/changelog b/debian/changelog
index 7b48b8c..223028b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ gmt (4.5.7-1) unstable; urgency=low
     of the distribution.
   * Added a build-dep on autotools-dev and provided usual snippets to override
     config.{sub,guess} files before configuring.
+  * Moved to copyright format version 1.0. Note that in 4.5.6 GMT team added
+    compatibility with any later version for GPL-2.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 07 Mar 2012 09:56:12 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 07 Mar 2012 12:14:54 +0100
 
 gmt (4.5.6-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 7bdd037..738ec39 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,21 @@
-
-This package was debianized by Torsten Landschoff <torsten at debian.org> on
-Wed, 29 Sep 1999 18:04:12 +0200
-
-The upstream source is available from 
-
-	http://gmt.soest.hawaii.edu/
-
-The main upstream authors are
-
-	Paul Wessel <wessel at soest.hawaii.edu>
-  and 	Walter Smith <wsmith at nodc.noaa.gov>
-
-Copyright:
-
-Copyright (c) 1991-2008, P. Wessel & W. H. F. Smith
-
-This software is covered by the GNU Library General Public Licence
-(version 2).
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'. If 
-you got the source archive you will find the license in the file COPYING 
-in the top directory.
+ormat: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: GMT
+Upstream-Contact: Paul Wessel <wessel at soest.hawaii.edu> and Walter Smith <wsmith at nodc.noaa.gov>
+Source: http://gmt.soest.hawaii.edu/
+
+File: *
+Copyright: 1991-2011 P.Wessel & W.H.F.Smith
+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; version 2 or 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.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'. If 
+ you got the source archive you will find the license in the file COPYING 
+ in the top directory.

-- 
Generic Mapping Tools