[libgeotiff-dfsg] 02/03: Update copyright file.

Mon Apr 27 16:53:48 UTC 2015

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

sebastic pushed a commit to branch master
in repository libgeotiff-dfsg.

commit 226f0f8acb26a37ffd3e25cc3104699ecee44f36
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Apr 27 18:40:14 2015 +0200

    Update copyright file.
    
    Changes:
    - Group copyright holders by license
    - Use standalone license specification for FSF licenses
    - Align copyright holders
    - Drop .0 from GPL license shortname
---
 debian/changelog |   5 ++
 debian/copyright | 139 +++++++++++++++++++++++++------------------------------
 2 files changed, 69 insertions(+), 75 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3bdc137..c0f854a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ libgeotiff-dfsg (1.4.1-1~exp2) UNRELEASED; urgency=medium
 
   * Add upstream metadata.
   * Update my email to @debian.org address.
+  * Update copyright file, changes:
+    - Group copyright holders by license
+    - Use standalone license specification for FSF licenses
+    - Align copyright holders
+    - Drop .0 from GPL license shortname
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 29 Nov 2014 00:53:42 +0100
 
diff --git a/debian/copyright b/debian/copyright
index b374f39..9231b84 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,14 +6,30 @@ Files-Excluded: csv/*
 
 Files: *
 Copyright: 1995, Niles D. Ritter
- 1999, Frank Warmerdam
+           1999, Frank Warmerdam
 License: attribution
 
 Files: INSTALL
 Copyright: 1994-1996, 1999-2002, 2004-2006, Free Software Foundation, Inc.
 License: fsf-doc-unlimited
- This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
+
+Files: cpl_csv.c
+ cpl_serv.c
+ cpl_serv.h
+ geo_ctrans.inc
+ geo_extra.c
+ geo_normalize.c
+ geo_normalize.h
+ geo_simpletags.c
+ geo_simpletags.h
+ geo_trans.c
+ geotiff_proj4.c
+Copyright: 1998-1999, 2005, 2008, Frank Warmerdam
+License: MIT
+
+Files: geo_strtod.c
+Copyright: 2006, Andrey Kiselev
+License: MIT
 
 Files: Makefile.in
  bin/Makefile.in
@@ -23,27 +39,11 @@ Files: Makefile.in
  man/man1/Makefile.in
 Copyright: 1994-2009, Free Software Foundation, Inc.
 License: fsf-makefile-unlimited
- This Makefile.in is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
- with or without modifications, as long as this notice is preserved.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
 
 Files: aclocal.m4
  configure
 Copyright: 1996-2009, Free Software Foundation, Inc.
 License: fsf-unlimited
- This file is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
- with or without modifications, as long as this notice is preserved.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
 
 Files: CMakeLists.txt
  cmake/FindGeoTIFF.cmake
@@ -59,80 +59,69 @@ Files: config.guess
  m4/doxygen.am
  missing
 Copyright: 1992-2009, Free Software Foundation, Inc.
- 2004, Oren Ben-Kiki
-License: GPL-2.0+ with Autoconf exception
+                2004, Oren Ben-Kiki
+License: GPL-2+ with Autoconf exception
 
 Files: install-sh
 Copyright: 1991, Massachusetts Institute of Technology
 License: install-sh
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of M.I.T. not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission.  M.I.T. makes no representations about the
- suitability of this software for any purpose.  It is provided "as is"
- without express or implied warranty.
 
-Files: geo_free.c
- geo_get.c
- geo_incode_defs.h
- geo_keyp.h
- geo_names.c
- geo_new.c
- geo_print.c
- geo_set.c
- geo_tiffp.c
- geo_tiffp.h
- geo_write.c
- geokeys.h
- geonames.h
- geotiff.h
- geotiffio.h
- geovalues.h
-Copyright: 1995, Niles D. Ritter
-License: attribution
-
-Files: cpl_csv.c
- cpl_serv.c
- cpl_serv.h
- geo_ctrans.inc
- geo_extra.c
- geo_normalize.c
- geo_normalize.h
- geo_simpletags.c
- geo_simpletags.h
- geo_trans.c
- geotiff_proj4.c
-Copyright: 1998-1999, 2005, 2008, Frank Warmerdam
-License: MIT
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2007, 2008, Free Software Foundation, Inc
+License: GPL-2+ with Libtool exception
 
 Files: bin/getopt.c
 Copyright: 1987, Regents of the University of California
 License: BSD-4-Clause
 
-Files: ltmain.sh
-Copyright: 1996-2001, 2003-2007, 2008, Free Software Foundation, Inc
-License: GPL-2.0+ with Libtool exception
-
-Files: geo_strtod.c
-Copyright: 2006, Andrey Kiselev
-License: MIT
-
 Files: bin/geotifcp.c
 Copyright: 1988-1995, Sam Leffler
-  1991-1995, Silicon Graphics, Inc
+           1991-1995, Silicon Graphics, Inc
 License: HPND-sl-sgi
 
 Files: debian/*
 Copyright: 2007, Francesco Paolo Lovergine <frankie at debian.org>
-License: GPL-2.0+
+License: GPL-2+
 
 License: attribution
  Permission granted to use this software, so long as this copyright
  notice accompanies any source code derived therefrom.
 
+License: fsf-doc-unlimited
+ This file is free documentation; the Free Software Foundation gives
+ unlimited permission to copy, distribute and modify it.
+
+License: fsf-makefile-unlimited
+ This Makefile.in is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
+
+License: fsf-unlimited
+ This file is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
+
+License: install-sh
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of M.I.T. not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission.  M.I.T. makes no representations about the
+ suitability of this software for any purpose.  It is provided "as is"
+ without express or implied warranty.
+
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
@@ -225,7 +214,7 @@ License: HPND-sl-sgi
  LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  OF THIS SOFTWARE.
 
-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 the License, or
@@ -243,7 +232,7 @@ License: GPL-2.0+
  On Debian systems, the complete text of version 2 of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-License: GPL-2.0+ with Autoconf exception
+License: GPL-2+ with Autoconf exception
  This file 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
@@ -268,7 +257,7 @@ License: GPL-2.0+ with Autoconf exception
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-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

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

