[libkml] 05/18: Update copyright file.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Mar 13 00:59:34 UTC 2015 

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

sebastic pushed a commit to branch master
in repository libkml.

commit 18f6218ddaf6087bb6a987c8dcc2fc71eb9f635b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 13 00:01:35 2015 +0100

    Update copyright file.
    
    Changes:
    - Replace third_party/googletest-r108 with third_party/gtest-1.7.0
    - Drop config/ltmain.sh, removed upstream
    - Group Boost copyright statements by license
    - Group zlib copyright statments by license
    - Use GPL-{2,3}+ instead of SPDX short name with .0.
---
 debian/changelog |   6 +
 debian/copyright | 367 +++++++------------------------------------------------
 2 files changed, 51 insertions(+), 322 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0686fd1..38f0fc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ libkml (1.3.0~r864+git20131113-9b50572+dfsg-1) UNRELEASED; urgency=medium
 
   * Switch upstream source from code.google.com to GitHub.
   * Merge changes from upstream git repository.
+  * Update copyright file, changes:
+    - Replace third_party/googletest-r108 with third_party/gtest-1.7.0
+    - Drop config/ltmain.sh, removed upstream
+    - Group Boost copyright statements by license
+    - Group zlib copyright statments by license
+    - Use GPL-{2,3}+ instead of SPDX short name with .0.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 12 Mar 2015 23:16:55 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 1f64e5c..a9daae0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,298 +9,38 @@ Files: *
 Copyright: 2008-2010, Google Inc.
 License: BSD-3-Clause
 
-Files: third_party/googletest-r108/*
-Copyright: 2005-2008, Google Inc
+Files: third_party/gtest-1.7.0/*
+Copyright: 2003, 2005-2010, 2013, Google Inc
 License: BSD-3-Clause
 
-Files: config/ltmain.sh
-Copyright: 1996-2001, 2003-2008, Free Software Foundation, Inc
-License: GPL-2.0+ with Libtool exception
-
-Files: third_party/boost_1_34_1/boost/config/abi/borland_prefix.hpp
- third_party/boost_1_34_1/boost/config/abi/borland_suffix.hpp
- third_party/boost_1_34_1/boost/config/abi/msvc_prefix.hpp
- third_party/boost_1_34_1/boost/config/abi/msvc_suffix.hpp
- third_party/boost_1_34_1/boost/config/abi_prefix.hpp
- third_party/boost_1_34_1/boost/config/abi_suffix.hpp
- third_party/boost_1_34_1/boost/config/auto_link.hpp
- third_party/boost_1_34_1/boost/config/requires_threads.hpp
-Copyright: 2003, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/no_tr1/complex.hpp
- third_party/boost_1_34_1/boost/config/no_tr1/functional.hpp
- third_party/boost_1_34_1/boost/config/no_tr1/memory.hpp
- third_party/boost_1_34_1/boost/config/no_tr1/utility.hpp
-Copyright: 2005, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/greenhills.hpp
- third_party/boost_1_34_1/boost/config/platform/beos.hpp
- third_party/boost_1_34_1/boost/config/user.hpp
-Copyright: 2001, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/compaq_cxx.hpp
- third_party/boost_1_34_1/boost/config/platform/cygwin.hpp
- third_party/boost_1_34_1/boost/config/posix_features.hpp
-Copyright: 2001-2003, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/sgi_mipspro.hpp
- third_party/boost_1_34_1/boost/config/platform/aix.hpp
- third_party/boost_1_34_1/boost/config/stdlib/vacpp.hpp
-Copyright: 2001-2002, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/platform/irix.hpp
- third_party/boost_1_34_1/boost/config/platform/solaris.hpp
-Copyright: 2003, Jens Maurer
- 2001-2003, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config.hpp
- third_party/boost_1_34_1/boost/config/platform/amigaos.hpp
-Copyright: 2002, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/hp_acc.hpp
-Copyright: 2002, Aleksey Gurtovoy
- 2006, Boris Gubenko
- 2002-2003, David Abrahams
- 2001-2003, Jens Maurer
- 2001-2003, John Maddock
- 2003, Toon Knapen
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/borland.hpp
-Copyright: 2002, Aleksey Gurtovoy
- 2002-2003, David Abrahams
- 2001-2003, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/mpw.hpp
-Copyright: 2002, Aleksey Gurtovoy
- 2001-2002, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/visualc.hpp
-Copyright: 2002, Aleksey Gurtovoy
- 2002-2003, Beman Dawes
- 2001-2002, Darin Adler
- 2002-2003, David Abrahams
- 2001-2003, John Maddock
- 2001, Peter Dimov
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/common_edg.hpp
-Copyright: 2002, Aleksey Gurtovoy
- 2002, David Abrahams
- 2001, Jens Maurer
- 2001-2002, John Maddock
- 2005, Markus Schöpflin
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/kai.hpp
-Copyright: 2002, Aleksey Gurtovoy
- 2002, David Abrahams
- 2001, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/intel.hpp
-Copyright: 2002-2003, Aleksey Gurtovoy
- 2003, Beman Dawes
- 2002-2003, David Abrahams
- 2002-2003, Guillaume Melquiond
- 2001, Jens Maurer
- 2001, John Maddock
- 2003, Martin Wille
- 2001, Peter Dimov
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/sunpro_cc.hpp
-Copyright: 2002-2003, Aleksey Gurtovoy
- 2002, David Abrahams
- 2001-2003, Jens Maurer
- 2001, John Maddock
- 2002, Peter Dimov
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/comeau.hpp
-Copyright: 2003, Aleksey Gurtovoy
- 2003, Beman Dawes
- 2001, Douglas Gregor
- 2003, Jens Maurer
- 2001, John Maddock
- 2001, Peter Dimov
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/platform/win32.hpp
-Copyright: 2003, Aleksey Gurtovoy
- 2001, Bill Kempf
- 2001-2003, John Maddock
- 2005, Rene Rivera
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/metrowerks.hpp
-Copyright: 2001-2003, Beman Dawes
- 2001, Darin Adler
- 2001-2002, David Abrahams
- 2001, John Maddock
- 2001, Peter Dimov
- 2004, Stefan Slapeta
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/gcc.hpp
-Copyright: 2001-2003, Beman Dawes
- 2001-2002, Darin Adler
- 2002-2003, David Abrahams
- 2002, Douglas Gregor
- 2001-2002, Jens Maurer
- 2001-2003, John Maddock
- 2003, Synge Todo
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/stdlib/libcomo.hpp
-Copyright: 2002-2003, Beman Dawes
- 2002-2003, Jens Maurer
- 2002-2003, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/vacpp.hpp
-Copyright: 2002-2003, Beman Dawes
- 2001-2003, John Maddock
- 2001, Lie-Quan Lee
- 2002-2003, Markus Schöpflin
- 2001-2003, Toon Knapen
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/suffix.hpp
-Copyright: 2002, Bill Kempf
- 2001, Darin Adler
- 2002-2003, David Abrahams
- 2003, Eric Friedman
- 2003, Gennaro Prota
- 2002, Jens Maurer
- 2001-2003, John Maddock
- 2001, Peter Dimov
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/platform/macos.hpp
-Copyright: 2002, Bill Kempf
- 2001-2002, Darin Adler
- 2001-2003, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/platform/hpux.hpp
-Copyright: 2006, Boris Gubenko
- 2002, David Abrahams
- 2001-2003, Jens Maurer
- 2001-2003, John Maddock
- 2003, Toon Knapen
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/digitalmars.hpp
-Copyright: 2003, Christof Meerwald
- 2003, Dan Watkins
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/checked_delete.hpp
-Copyright: 2002-2003, Peter Dimov
- 2003, Daniel Frey
- 2003, Howard Hinnant
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/platform/bsd.hpp
-Copyright: 2001, Darin Adler
- 2002, Douglas Gregor
- 2001-2003, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/stdlib/stlport.hpp
-Copyright: 2001, Darin Adler
- 2001, Jens Maurer
- 2001-2002, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/stdlib/sgi.hpp
-Copyright: 2001, Darin Adler
- 2001-2003, Jens Maurer
- 2001-2003, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/stdlib/msl.hpp
-Copyright: 2001, Darin Adler
- 2001, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/detail/workaround.hpp
-Copyright: 2002, David Abrahams
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/stdlib/dinkumware.hpp
-Copyright: 2002, David Abrahams
- 2003, Guillaume Melquiond
- 2001, Jens Maurer
- 2001-2003, John Maddock
- 2001, Peter Dimov
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/stdlib/roguewave.hpp
-Copyright: 2003, David Abrahams
- 2001, Jens Maurer
- 2001-2003, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/scoped_ptr.hpp
-Copyright: 2001-2002, Peter Dimov
- 1998-1999, Greg Colvin and Beman Dawes
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/select_compiler_config.hpp
-Copyright: 2003, Guillaume Melquiond
- 2001-2003, John Maddock
- 2003, Martin Wille
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/stdlib/modena.hpp
-Copyright: 2001, Jens Maurer
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/select_platform_config.hpp
-Copyright: 2001, Jens Maurer
- 2001-2002, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/stdlib/libstdcpp3.hpp
-Copyright: 2001, Jens Maurer
- 2001, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/platform/linux.hpp
-Copyright: 2001-2003, Jens Maurer
- 2001-2003, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/select_stdlib_config.hpp
-Copyright: 2001-2002, Jens Maurer
- 2001-2003, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/platform/qnxnto.hpp
-Copyright: 2005, Jim Douglas
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/config/compiler/gcc_xml.hpp
-Copyright: 2006, John Maddock
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/intrusive_ptr.hpp
-Copyright: 2001-2002, Peter Dimov
-License: BSL-1.0
-
-Files: third_party/boost_1_34_1/boost/assert.hpp
-Copyright: 2001-2002, Peter Dimov and Multi Media Ltd
+Files: third_party/boost_1_34_1/*
+Copyright:  1998-1999, Greg Colvin
+                 2001, Lie-Quan Lee
+            2001-2002, Bill Kempf
+            2001-2002, Douglas Gregor
+            2001-2002, Darin Adler
+            2001-2002, Multi Media Ltd
+                 2003, Christof Meerwald
+                 2003, Dan Watkins
+                 2003, Daniel Frey
+                 2003, Eric Friedman
+                 2003, Gennaro Prota
+                 2003, Howard Hinnant
+                 2003, Martin Wille
+                 2003, Synge Todo
+ 1998-1999, 2001-2003, Beman Dawes
+            2001-2003, David Abrahams
+            2001-2003, Jens Maurer
+            2001-2003, Peter Dimov
+            2001-2003, Toon Knapen
+            2002-2003, Aleksey Gurtovoy
+            2002-2003, Guillaume Melquiond
+                 2004, Stefan Slapeta
+                 2005, Rene Rivera
+                 2005, Jim Douglas
+      2002-2003, 2005, Markus Schöpflin
+                 2006, Boris Gubenko
+ 2001-2003, 2005-2006, John Maddock
 License: BSL-1.0
 
 Files: third_party/expat.win32/expat.h
@@ -310,23 +50,29 @@ License: MIT
 
 Files: third_party/uriparser-0.7.5/*
 Copyright: 2007, Sebastian Pipping <webmaster at hartwork.org>
- 2007, Weijia Song <songweijia at gmail.com>
+           2007, Weijia Song <songweijia at gmail.com>
 License: BSD-3-Clause
 
 Files: third_party/uriparser-0.7.5/build-aux/ltmain.sh
 Copyright: 1996-2001, 2003-2008, Free Software Foundation, Inc.
-License: GPL-2.0+ with Libtool exception
+License: GPL-2+ with Libtool exception
 
 Files: third_party/uriparser-0.7.5/test/FourSuite.cpp
  third_party/uriparser-0.7.5/test/FourSuite.h
  third_party/uriparser-0.7.5/test/test.cpp
 Copyright: 2007, Sebastian Pipping <webmaster at hartwork.org>
- 2007, Weijia Song <songweijia at gmail.com>
+           2007, Weijia Song <songweijia at gmail.com>
 License: LGPL-2.1+
 
+Files: third_party/zlib-1.2.3/*
+Copyright: 1995-2005, Jean-loup Gailly
+           1995-2005, Mark Adler
+           1998-2005, Gilles Vollant
+License: zlib
+
 Files: third_party/zlib-1.2.3/contrib/minizip/unzip.c
-Copyright: 1990-2000, Info-ZIP.
- 1998-2005, Gilles Vollant
+Copyright: 1990-2000, Info-ZIP
+           1998-2005, Gilles Vollant
 Comment: Decryption code comes from crypt.c by Info-ZIP but has been greatly
  reduced in terms of compatibility with older software. The following is from
  the original crypt.c. Code woven in by Terry Thorsen 1/2003.
@@ -353,7 +99,7 @@ License: zlib
 
 Files: third_party/zlib-1.2.3/contrib/minizip/iomem_simple.c
 Copyright: 1998-2003, Gilles Vollant
- 2003, Justin Fletcher
+                2003, Justin Fletcher
 Comment: This file is from the proposed iomem_simple package found at
  http://code.trak.dk/
  .
@@ -404,32 +150,9 @@ Comment: This code is a modified version of crypting code in Infozip distributio
  Encryption is not supported.
 License: zlib
 
-Files: third_party/zlib-1.2.3/contrib/minizip/unzip.h
- third_party/zlib-1.2.3/contrib/minizip/zip.h
-Copyright: 1998-2005, Gilles Vollant
-License: zlib
-
-Files: third_party/zlib-1.2.3/zconf.h
-Copyright: 1995-2005, Jean-loup Gailly
-License: zlib
-
-Files: third_party/zlib-1.2.3/zlib.h
-Copyright: 1995-2005, Jean-loup Gailly and Mark Adler
-License: zlib
-
-Files: third_party/zlib-1.2.3/contrib/minizip/ioapi.c
- third_party/zlib-1.2.3/contrib/minizip/ioapi.h
- third_party/zlib-1.2.3/contrib/minizip/iowin32.c
- third_party/zlib-1.2.3/contrib/minizip/iowin32.h
- third_party/zlib-1.2.3/contrib/minizip/miniunz.c
- third_party/zlib-1.2.3/contrib/minizip/minizip.c
- third_party/zlib-1.2.3/contrib/minizip/zip.c
-Copyright: 1998-2005, Gilles Vollant
-License: zlib
-
 Files: debian/*
 Copyright: 2009, Francesco Paolo Lovergine <frankie at debian.org>
-License: GPL-3.0+
+License: GPL-3+
 
 License: BSD-3-Clause
  Redistribution and use in source and binary forms, with or without
@@ -480,7 +203,7 @@ License: BSL-1.0
  ARISING 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
@@ -506,7 +229,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-3.0+
+License: GPL-3+
  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 3 of the License, or

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

More information about the Pkg-grass-devel mailing list