[gdal] 01/01: Update copyright file.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Jun 28 21:47:50 UTC 2015 

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

sebastic pushed a commit to branch experimental-2.0
in repository gdal.

commit 2c5e2187b0a1723bc61954df32186b052eac35f1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 28 19:28:56 2015 +0200

    Update copyright file.
    
    Changes:
    - Drop .0 from GPL license shortnames
    - Strip trailing whitespace
    - Use range notation for copyright years
    - Add sbnsearch.c to MIT or LGPL-2+ section
---
 debian/changelog |   4 ++
 debian/copyright | 143 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 76 insertions(+), 71 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21cdf15..6227c20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ gdal (2.0.0+dfsg-1) UNRELEASED; urgency=medium
   * Update copyright file, changes:
     - Update copyright years & holders
     - Drop files section for gcore/gdal_rpcimdio.cpp, removed upstream
+    - Drop .0 from GPL license shortnames
+    - Strip trailing whitespace
+    - Use range notation for copyright years
+    - Add sbnsearch.c to MIT or LGPL-2+ section
   * Use uscan in get-orig-source target.
   * Drop patches applied upstream, refresh remaining patches.
   * Rename libgdal1h to libgdal20 to match SONAME.
diff --git a/debian/copyright b/debian/copyright
index e8bc8ed..08f61fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Comment: Several data files with unclear rights are removed to create
  gdal/data/cubewerx_extra.wkt
  Derived from definitions distributed by Cubewerx.
  See http://trac.osgeo.org/gdal/ticket/2165
- . 
+ .
  gdal/data/ecw_cs.wkt
  Derived via much processing from ERMapper GDT definitions.
  See http://trac.osgeo.org/gdal/ticket/2162
@@ -129,7 +129,7 @@ License: MIT-short
 Files: config.guess
  config.sub
 Copyright: 1992-2006, Free Software Foundation
-License: GPL-2.0+
+License: GPL-2+
 
 Files: configure
 Copyright: 1992-2010, Free Software Foundation, Inc.
@@ -141,13 +141,13 @@ License: fsf-unlimited-disclaimer
 
 Files: ltmain.sh
 Copyright: 1996-2001, 2003-2010, Free Software Foundation, Inc
-License: GPL-2.0+ with Libtool exception
+License: GPL-2+ with Libtool exception
 
 Files: apps/gdaldem.cpp
 Copyright: 2006, 2009, Matthew Perry
             2009-2013, Even Rouault <even dot rouault at mines-paris dot org>
-Comment: Portions derived from GRASS 4.1 (public domain) See 
- http://trac.osgeo.org/gdal/ticket/2975 for more information regarding 
+Comment: Portions derived from GRASS 4.1 (public domain) See
+ http://trac.osgeo.org/gdal/ticket/2975 for more information regarding
  history of this code
 License: MIT
 
@@ -167,40 +167,40 @@ License: MIT
 Files: frmts/grib/degrib18/*
 Copyright: NOAA NWS
 License: public-domain
- The degrib and g2clib source code are modified versions of code produced 
+ The degrib and g2clib source code are modified versions of code produced
  by NOAA NWS and are in the public domain subject to the following
  restrictions:
  .
  http://www.weather.gov/im/softa.htm
  .
- DISCLAIMER The United States Government makes no warranty, expressed or 
- implied, as to the usefulness of the software and documentation for any 
- purpose. The U.S. Government, its instrumentalities, officers, employees, 
- and agents assumes no responsibility (1) for the use of the software and 
- documentation listed below, or (2) to provide technical support to users. 
+ DISCLAIMER The United States Government makes no warranty, expressed or
+ implied, as to the usefulness of the software and documentation for any
+ purpose. The U.S. Government, its instrumentalities, officers, employees,
+ and agents assumes no responsibility (1) for the use of the software and
+ documentation listed below, or (2) to provide technical support to users.
  .
  http://www.weather.gov/disclaimer.php
  .
-  The information on government servers are in the public domain, unless 
- specifically annotated otherwise, and may be used freely by the public so 
- long as you do not 1) claim it is your own (e.g. by claiming copyright for 
- NWS information -- see below), 2) use it in a manner that implies an 
- endorsement or affiliation with NOAA/NWS, or 3) modify it in content and 
- then present it as official government material. You also cannot present 
- information of your own in a way that makes it appear to be official 
+  The information on government servers are in the public domain, unless
+ specifically annotated otherwise, and may be used freely by the public so
+ long as you do not 1) claim it is your own (e.g. by claiming copyright for
+ NWS information -- see below), 2) use it in a manner that implies an
+ endorsement or affiliation with NOAA/NWS, or 3) modify it in content and
+ then present it as official government material. You also cannot present
+ information of your own in a way that makes it appear to be official
  government information..
  .
-  The user assumes the entire risk related to its use of this data. NWS is 
- providing this data "as is," and NWS disclaims any and all warranties, 
- whether express or implied, including (without limitation) any implied 
- warranties of merchantability or fitness for a particular purpose. In no 
- event will NWS be liable to you or to any third party for any direct, 
- indirect, incidental, consequential, special or exemplary damages or lost 
+  The user assumes the entire risk related to its use of this data. NWS is
+ providing this data "as is," and NWS disclaims any and all warranties,
+ whether express or implied, including (without limitation) any implied
+ warranties of merchantability or fitness for a particular purpose. In no
+ event will NWS be liable to you or to any third party for any direct,
+ indirect, incidental, consequential, special or exemplary damages or lost
  profit resulting from any use or misuse of this data.
  .
-  As required by 17 U.S.C. 403, third parties producing copyrighted works 
- consisting predominantly of the material appearing in NWS Web pages must 
- provide notice with such work(s) identifying the NWS material incorporated 
+  As required by 17 U.S.C. 403, third parties producing copyrighted works
+ consisting predominantly of the material appearing in NWS Web pages must
+ provide notice with such work(s) identifying the NWS material incorporated
  and stating that such material is not subject to copyright protection.
 
 Files: frmts/gtiff/tif_float.c
@@ -380,54 +380,54 @@ License: BSD-3-Clause
 Files: frmts/pds/isis2dataset.cpp
 Copyright: 2006, Frank Warmerdam <warmerdam at pobox.com>
       2008-2011, Even Rouault <even dot rouault at mines-paris dot org>
-Comment: 
+Comment:
  Project:  ISIS Version 2 Driver
  Purpose:  Implementation of ISIS2Dataset
  Author:   Trent Hare (thare at usgs.gov),
            Robert Soricone (rsoricone at usgs.gov)
-           Ludovic Mercier (ludovic.mercier at gmail.com) 
+           Ludovic Mercier (ludovic.mercier at gmail.com)
            Frank Warmerdam (warmerdam at pobox.com)
  .
- NOTE: Original code authored by Trent and Robert and placed in the public 
- domain as per US government policy.  I have (within my rights) appropriated 
- it and placed it under the following license.  This is not intended to 
- diminish Trent and Roberts contribution. 
+ NOTE: Original code authored by Trent and Robert and placed in the public
+ domain as per US government policy.  I have (within my rights) appropriated
+ it and placed it under the following license.  This is not intended to
+ diminish Trent and Roberts contribution.
 License: MIT
 
 Files: frmts/pds/isis3dataset.cpp
 Copyright: 2007, Frank Warmerdam <warmerdam at pobox.com>
       2009-2010, Even Rouault <even dot rouault at mines-paris dot org>
-Comment: 
+Comment:
  Project:  ISIS Version 3 Driver
  Purpose:  Implementation of ISIS3Dataset
  Author:   Trent Hare (thare at usgs.gov)
            Frank Warmerdam (warmerdam at pobox.com)
  .
- NOTE: Original code authored by Trent and placed in the public domain as 
- per US government policy.  I have (within my rights) appropriated it and 
- placed it under the following license.  This is not intended to diminish 
- Trents contribution. 
+ NOTE: Original code authored by Trent and placed in the public domain as
+ per US government policy.  I have (within my rights) appropriated it and
+ placed it under the following license.  This is not intended to diminish
+ Trents contribution.
 License: MIT
 
 Files: frmts/pds/pdsdataset.cpp
 Copyright: 2007, Frank Warmerdam <warmerdam at pobox.com>
       2008-2013, Even Rouault <even dot rouault at mines-paris dot org>
-Comment: 
+Comment:
  Project:  PDS Driver; Planetary Data System Format
  Purpose:  Implementation of PDSDataset
  Author:   Trent Hare (thare at usgs.gov),
            Robert Soricone (rsoricone at usgs.gov)
  .
- NOTE: Original code authored by Trent and Robert and placed in the public 
- domain as per US government policy.  I have (within my rights) appropriated 
- it and placed it under the following license.  This is not intended to 
- diminish Trent and Roberts contribution. 
+ NOTE: Original code authored by Trent and Robert and placed in the public
+ domain as per US government policy.  I have (within my rights) appropriated
+ it and placed it under the following license.  This is not intended to
+ diminish Trent and Roberts contribution.
 License: MIT
 
 Files: frmts/png/libpng/*
 Copyright: 1998-2014, Glenn Randers-Pehrson
-          1996, 1997, Andreas Dilger
-          1995, 1996, Guy Eric Schalnat, Group 42, Inc.
+           1996-1997, Andreas Dilger
+           1995-1996, Guy Eric Schalnat, Group 42, Inc.
 License: libpng
 
 Files: frmts/rmf/rmflzw.cpp
@@ -502,7 +502,7 @@ Files: ogr/osr_cs_wkt_parser.c
  ogr/swq_parser.hpp
 Copyright: 1984, 1989-1990, 2000-2013, Free Software Foundation, Inc
                             2010-2013, Even Rouault <even dot rouault at mines-paris dot org>
-License: GPL-3.0+ with Bison exception
+License: GPL-3+ with Bison exception
 
 Files: ogr/swq.cpp
  ogr/swq.h
@@ -523,15 +523,15 @@ Copyright: 2004-2005, Metaparadigm Pte. Ltd.
 License: MIT
 
 Files: ogr/ogrsf_frmts/ods/ods_formula_parser.cpp
-Copyright: 1984, 1989, 1990, 2000-2006, Free Software Foundation, Inc.
-                                  2010, Frank Warmerdam <warmerdam at pobox.com>
-                                  2012, Even Rouault <even dot rouault at mines-paris dot org>
-License: MIT and GPL-3.0+ with Bison exception
+Copyright: 1984, 1989-1990, 2000-2006, Free Software Foundation, Inc.
+                                 2010, Frank Warmerdam <warmerdam at pobox.com>
+                                 2012, Even Rouault <even dot rouault at mines-paris dot org>
+License: MIT and GPL-3+ with Bison exception
 
 Files: ogr/ogrsf_frmts/ods/ods_formula_parser.hpp
-Copyright: 1984, 1989, 1990, 2000-2006, Free Software Foundation, Inc.
-                                  2012, Even Rouault <even dot rouault at mines-paris dot org>
-License: GPL-3.0+ with Bison exception
+Copyright: 1984, 1989-1990, 2000-2006, Free Software Foundation, Inc.
+                                 2012, Even Rouault <even dot rouault at mines-paris dot org>
+License: GPL-3+ with Bison exception
 
 Files: ogr/ogrsf_frmts/pg/ogrpglayer.cpp
 Copyright: 1994, The Regents of the University of California
@@ -541,12 +541,13 @@ Copyright: 1994, The Regents of the University of California
 License: MIT and PostgreSQL
 
 Files: ogr/ogrsf_frmts/shape/dbfopen.c
+ ogr/ogrsf_frmts/shape/sbnsearch.c
  ogr/ogrsf_frmts/shape/shapefil.h
  ogr/ogrsf_frmts/shape/shpopen.c
  ogr/ogrsf_frmts/shape/shptree.c
 Copyright: 1999, 2001, Frank Warmerdam
             2011-2013, Even Rouault <even dot rouault at mines-paris dot org>
-License: MIT or LGPL-2.0+
+License: MIT or LGPL-2+
 
 Files: ogr/ogrsf_frmts/sqlite/ogrsqlite3ext.h
 Copyright: 2012-2013, Even Rouault <even dot rouault at mines-paris dot org>
@@ -575,7 +576,7 @@ Comment: Contains headers from sqlite3.
  This header file defines the SQLite interface for use by
  shared libraries that want to be imported as extensions into
  an SQLite instance.  Shared libraries that intend to be loaded
- as extensions by SQLite should #include this file instead of 
+ as extensions by SQLite should #include this file instead of
  sqlite3.h.
 License: MIT
 
@@ -586,7 +587,7 @@ Copyright: 2003-2004, Frank Warmerdam <warmerdam at pobox.com>
            2007-2013, Even Rouault <even dot rouault at mines-paris dot org>
 Comment: Contributor: Alessandro Furieri, a.furieri at lqt.it
  Portions of this module properly supporting SpatiaLite Table/Geom creation
- Developed for Faunalia ( http://www.faunalia.it) with funding from 
+ Developed for Faunalia ( http://www.faunalia.it) with funding from
  Regione Toscana - Settore SISTEMA INFORMATIVO TERRITORIALE ED AMBIENTALE
 License: MIT
 
@@ -612,7 +613,7 @@ Copyright: 2002, Refractions Research
 Comment: CPLBase64Encode() was extracted from the base64 cpp utility published by
  René Nyffenegger. The code was modified into a form suitable for use in
  CPL.  The original code can be found at
- http://www.adp-gmbh.ch/cpp/common/base64.html. 
+ http://www.adp-gmbh.ch/cpp/common/base64.html.
 License: MIT and Base64
 
 Files: port/cpl_minizip_ioapi.cpp
@@ -662,7 +663,7 @@ Files: swig/python/samples/gdal_vrtmerge.py
 Copyright: 2000, Atlantis Scientific Inc. (www.atlsci.com)
            2005, Gabriel Ebner <ge at gabrielebner.at>
       2009-2011, Even Rouault <even dot rouault at mines-paris dot org>
-License: LGPL-2.0+
+License: LGPL-2+
 
 License: fsf-unlimited-configure
  This configure script is free software; the Free Software Foundation
@@ -736,7 +737,7 @@ License: BSD-3-Clause
  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
- 
+
 License: GPL-1.0+
  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
@@ -746,7 +747,7 @@ License: GPL-1.0+
  On Debian systems, the complete text of version 1 of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-1'.
 
-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
@@ -764,7 +765,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 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
@@ -789,7 +790,7 @@ License: GPL-2.0+ with Libtool exception
  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-3.0+ with Bison exception
+License: GPL-3+ with Bison exception
  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
@@ -817,9 +818,9 @@ License: GPL-3.0+ with Bison exception
  version 2.2 of Bison.
 
 License: HPND-eos
- Permission to use, modify, and distribute this software and its documentation 
- for any purpose without fee is hereby granted, provided that the above 
- copyright notice appear in all copies and that both that copyright notice and 
+ Permission to use, modify, and distribute this software and its documentation
+ for any purpose without fee is hereby granted, provided that the above
+ copyright notice appear in all copies and that both that copyright notice and
  this permission notice appear in supporting documentation.
 
 License: HPND-3i
@@ -1053,9 +1054,9 @@ License: ITT
  to deal in the Software without restriction, including without limitation
  the rights to use, copy, modify, merge, publish, distribute, sublicense,
  and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions: 
+ Software is furnished to do so, subject to the following conditions:
  The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software. 
+ in all copies or substantial portions of the Software.
  .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -1073,7 +1074,7 @@ License: JasPer-2.0
  Copyright (c) 1999-2000 The University of British Columbia
  .
  All rights reserved.
- . 
+ .
  Permission is hereby granted, free of charge, to any person (the
  "User") obtaining a copy of this software and associated documentation
  files (the "Software"), to deal in the Software without restriction,
@@ -1081,11 +1082,11 @@ License: JasPer-2.0
  publish, distribute, and/or sell copies of the Software, and to permit
  persons to whom the Software is furnished to do so, subject to the
  following conditions:
- . 
+ .
  1.  The above copyright notices and this permission notice (which
  includes the disclaimer below) shall be included in all copies or
  substantial portions of the Software.
- . 
+ .
  2.  The name of a copyright holder shall not be used to endorse or
  promote products derived from the Software without specific prior
  written permission.
@@ -1117,7 +1118,7 @@ License: JasPer-2.0
  RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
  EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
 
-License: LGPL-2.0+
+License: LGPL-2+
  This library 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; either

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

More information about the Pkg-grass-devel mailing list