[proj] 02/04: Update copyright file.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository proj.

commit 495d53079769eeda17a466b2895c4a04ff41aefb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Aug 19 15:45:19 2015 +0200

    Update copyright file.
    
    Changes:
    - Group copyright holders by license
    - Drop .0 from GPL license shortname
---
 debian/changelog |  3 +++
 debian/copyright | 82 +++++++++-----------------------------------------------
 2 files changed, 15 insertions(+), 70 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68cf4b8..cbfb1a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 proj (4.9.1-2) UNRELEASED; urgency=medium
 
   * Update upstream metadata for move to GitHub.
+  * Update copyright file, changes:
+    - Group copyright holders by license
+    - Drop .0 from GPL license shortname
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 19 Aug 2015 15:35:50 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 0b8057c..66df74b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -32,48 +32,14 @@ Comment: Version 4.3.3 was authored by:
  .
    Though I have put my own name as copyright holder, I don't mean to imply
    I did the work.  Essentially all work was done by Gerald Evenden.
-Copyright: 2000, Frank Warmerdam
-License: MIT
-
-Files: src/geodesic.c
-Copyright: 2012-2014, Charles Karney <charles at karney.com>
-License: MIT
-
-Files: src/multistresstest.c
- src/pj_apply_vgridshift.c
- src/pj_ctx.c
- src/pj_fileapi.c
- src/pj_gc_reader.c
- src/pj_geocent.c
- src/pj_gridcatalog.c
- src/pj_initcache.c
- src/pj_log.c
- src/pj_mutex.c
- src/pj_utils.c
- src/proj_api.h
-Copyright: 2001-2002, 2009-2010, 2012-2013, Frank Warmerdam <warmerdam at pobox.com>
-License: MIT
-
-Files: src/pj_init.c
- src/pj_open_lib.c
-Copyright: 1995, Gerald Evenden
-           2002, Frank Warmerdam <warmerdam at pobox.com>
-License: MIT
-
-Files: src/PJ_aea.c
- src/PJ_aeqd.c
- src/PJ_airy.c
- src/PJ_aitoff.c
- src/PJ_nzmg.c
-Copyright: 1995, Gerald Evenden
-License: MIT
-
-Files: src/PJ_omerc.c
- src/PJ_sterea.c
- src/pj_gauss.c
- src/proj_mdist.c
- src/proj_rouss.c
-Copyright: 2003, 2006, Gerald I. Evenden
+Copyright:             2012-2014, Charles Karney <charles at karney.com>
+ 2000-2002, 2009-2010, 2012-2013, Frank Warmerdam <warmerdam at pobox.com>
+                       2011-2012, Martin Lambers <marlam at marlam.de>
+                            2012, Martin Raspaud
+                            2011, Open Geospatial Consortium, Inc
+           1995, 2003-2004, 2006, Gerald I. Evenden
+                            2005, Antonello Andrea
+                            2001, Thomas Flemming <tf at ttqv.com>
 License: MIT
 
 Files: src/proj_etmerc.c
@@ -90,30 +56,6 @@ Comment: The code in this file is largly based upon procedures:
 Copyright: 2008, Gerald I. Evenden
 License: MIT
 
-Files: jniwrap/org/proj4/PJ.java
- jniwrap/org/proj4/PJException.java
- jniwrap/org/proj4/package-info.java
-Copyright: 2011, Open Geospatial Consortium, Inc
-License: MIT
-
-Files: src/jniproj.c
-Copyright: 2005, Antonello Andrea
-License: MIT
-
-Files: src/PJ_healpix.c
- src/PJ_krovak.c
-Copyright: 2001, Thomas Flemming <tf at ttqv.com>
-License: MIT
-
-Files: src/PJ_geos.c
-Copyright: 2004, Gerald I. Evenden
-           2012, Martin Raspaud
-License: MIT
-
-Files: src/PJ_qsc.c
-Copyright: 2011-2012, Martin Lambers <marlam at marlam.de>
-License: MIT
-
 Files: src/PJ_isea.c
 Copyright: disclaimed
 License: public-domain
@@ -122,13 +64,13 @@ License: public-domain
 
 Files: ltmain.sh
 Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
-License: GPL-2.0+ with Libtool exception
+License: GPL-2+ with Libtool exception
 
 Files: debian/*
 Copyright:  1999-2005, Peter S Galbraith <psg at debian.org>
  2007-2009, 2012-2013, Francesco Paolo Lovergine <frankie at debian.org>
                  2014, Bas Couwenberg <sebastic at xs4all.nl>
-License: GPL-2.0+
+License: GPL-2+
 
 Files: debian/datumgrids.shar
  debian/datumgrids-ch.shar
@@ -156,7 +98,7 @@ License: MIT
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-License: GPL-2.0+ with Libtool exception
+License: GPL-2+ with Libtool exception
  GNU Libtool 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
@@ -182,7 +124,7 @@ License: GPL-2.0+ with Libtool exception
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-License: GPL-2.0+
+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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git