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

sebastic-guest pushed a commit to branch master
in repository shapelib.

commit 835d64c931b3d9ac4dfa3ed43704f79c694f2c5c
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Tue Oct 14 21:06:51 2014 +0200

    Update copyright file.
---
 debian/changelog |   1 +
 debian/copyright | 172 ++++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 120 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25939fa..ef74d23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ shapelib (1.3.0-4) UNRELEASED; urgency=medium
   [ Bas Couwenberg ]
   * Add myself to Uploaders.
   * Add gbp.conf to use pristine-tar by default.
+  * Update copyright file.
 
  -- Bas Couwenberg <sebas...@xs4all.nl>  Tue, 14 Oct 2014 21:09:52 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 5b840ca..0074dfd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,68 +1,134 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Shapefile C Library
 Upstream-Contact: Frank Warmerdam <warmer...@pobox.com> 
-Source: http://shapelib.maptools.org/
+Source: http://download.osgeo.org/shapelib/
 
 Files: *
 Copyright: 1999-2013, Frank Warmerdam <warme...@pobox.com> 
-                  1999, Carl Anderson 
-                  1992, 1996 Free Software Foundation
-                  2004, Eric Miller
-                  2002, Kevin Meyer
-                  2005, Springs Rescue Mission
-                  2004, Marco Podgorsek
-License: Expat or LGPL
- 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 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:
- .
- The above copyright notice and this permission notice shall be
- included 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, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
+           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+
+
+Files: contrib/csv2shp.c
+Copyright: 2005, Springs Rescue Mission
+License: GPL-2+
+
+Files: contrib/dbfcat.c
+Copyright: 1995, Frank Warmerdam
+License: public-domain
+ This code is in the public domain.
+
+Files: contrib/dbfinfo.c
+Copyright: 1999, Carl Anderson
+License: public-domain
+ This code is in the public domain.
  .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in "/usr/share/common-licenses/LGPL"
+ 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 <ke...@cybertracker.co.za>
+License: MIT or LGPL-2+
+
+Files: contrib/Shape_PointInPoly.cpp
+Copyright: 2004, Marko Podgorsek <d-...@siol.net>
+License: MIT or LGPL-2+
+
+Files: contrib/shpcat.c
+ contrib/shpcentrd.c
+ contrib/shpdata.c
+ contrib/shpdxf.c
+ contrib/shpfix.c
+ contrib/shpgeo.c
+ contrib/shpgeo.h
+ contrib/shpinfo.c
+ contrib/shpproj.c
+ contrib/shpwkb.c
+Copyright: 1999, Carl Anderson
+License: MIT
+
+Files: contrib/shpsort.c
+Copyright: 2004, Eric G. Miller
+License: MIT
 
 Files: debian/*
 Copyright: 2012, Francesco Paolo Lovergine <fran...@debian.org>
-                  2010, DebianGis contributors 
<pkg-grass-devel@lists.alioth.debian.org>
-License: GPL-3
- On Debian systems, the complete text of the GNU General
- Public License can be found in "/usr/share/common-licenses/GPL-3".
+           2010, DebianGis contributors 
<pkg-grass-devel@lists.alioth.debian.org>
+License: GPL-3+
 
-Files contrib/*
-License: Expat or LGPL, LGPL2+, public-domain
- 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 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:
+License: MIT
+ 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
+ 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:
  .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
+ The above copyright notice and this permission notice shall be included
+ 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, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
+
+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
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU Library General Public
+ 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.
+ .
+ This program 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.
  .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in "/usr/share/common-licenses/LGPL"
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-2'.
+
+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 (at your option) any later
+ version.
+ .
+ This program 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.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the complete text of the GPL-3 License can be
+ found in `/usr/share/common-licenses/GPL-3'.
+

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to