[shapelib] 06/22: Update copyright file.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository shapelib.

commit b886c68c790a2e115588afda303dca935b206f91
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Dec 6 20:04:28 2016 +0100

    Update copyright file.
    
    Changes:
    - Add copyright holders
    - Add license & copyright for CMakeLists.txt & sbnsearch.c
    - Rename MIT license shortname to Expat
---
 debian/changelog |  5 +++++
 debian/copyright | 60 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d269182..2cbfe2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ shapelib (1.4.0~rc1-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
   * Force lowercase RC in watch file.
+  * Update copyright file, changes:
+    - Add copyright holders
+    - Add license & copyright for CMakeLists.txt & sbnsearch.c
+    - Drop license & copyright for csv2shp.c & my_nan.h
+    - Rename MIT license shortname to Expat
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 06 Dec 2016 19:46:29 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 0074dfd..b7906f6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,21 +1,22 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Shapefile C Library
-Upstream-Contact: Frank Warmerdam <warmerdam at pobox.com> 
+Upstream-Contact: Frank Warmerdam <warmerdam at pobox.com>
 Source: http://download.osgeo.org/shapelib/
 
 Files: *
-Copyright: 1999-2013, Frank Warmerdam <warmedam at pobox.com> 
-           1999, Carl Anderson 
-           1992, 1996 Free Software Foundation
-           2004, Eric Miller
-           2002, Kevin Meyer
-           2005, Springs Rescue Mission
-           2004, Marco Podgorsek
-License: MIT or LGPL-2+
+Copyright: 2012-2016, Even Rouault <even dot rouault at mines-paris dot org>
+           1999-2013, Frank Warmerdam <warmedam at pobox.com>
+                2005, Springs Rescue Mission
+                2004, Eric Miller
+                2004, Marco Podgorsek
+                2002, Kevin Meyer
+                1999, Carl Anderson
+          1992, 1996, Free Software Foundation
+License: Expat or LGPL-2+
 
-Files: contrib/csv2shp.c
-Copyright: 2005, Springs Rescue Mission
-License: GPL-2+
+Files: CMakeLists.txt
+Copyright: 2012-2013 Alan W. Irwin
+License: GPL-2
 
 Files: contrib/dbfcat.c
 Copyright: 1995, Frank Warmerdam
@@ -29,17 +30,13 @@ License: public-domain
  .
  This code is based in part on the earlier work of Frank Warmerdam
 
-Files: contrib/my_nan.h
-Copyright: 1992, 1996, Free Software Foundation, Inc.
-License: GPL-2+
-
 Files: contrib/ShapeFileII.pas
 Copyright: 2002, Keven Meyer <Kevin at CyberTracker.co.za>
-License: MIT or LGPL-2+
+License: Expat or LGPL-2+
 
 Files: contrib/Shape_PointInPoly.cpp
 Copyright: 2004, Marko Podgorsek <d-mon at siol.net>
-License: MIT or LGPL-2+
+License: Expat or LGPL-2+
 
 Files: contrib/shpcat.c
  contrib/shpcentrd.c
@@ -52,18 +49,22 @@ Files: contrib/shpcat.c
  contrib/shpproj.c
  contrib/shpwkb.c
 Copyright: 1999, Carl Anderson
-License: MIT
+License: Expat
 
 Files: contrib/shpsort.c
 Copyright: 2004, Eric G. Miller
-License: MIT
+License: Expat
+
+Files: sbnsearch.c
+Copyright: 2012-2014, Even Rouault <even dot rouault at mines-paris dot org>
+License: Expat
 
 Files: debian/*
 Copyright: 2012, Francesco Paolo Lovergine <frankie at debian.org>
            2010, DebianGis contributors <pkg-grass-devel at lists.alioth.debian.org>
 License: GPL-3+
 
-License: MIT
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
  to deal in the Software without restriction, including without limitation
@@ -97,16 +98,19 @@ License: LGPL-2+
  License version 2 can be found in the file
  `/usr/share/common-licenses/LGPL-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.
+License: GPL-2
+ This file is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; version 2 of the License.
  .
- This program is distributed in the hope that it will be useful,
+ This file 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.
+ GNU Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public License
+ along with this file; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, 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-2'.

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