[SCM] libspatialindex branch, master, updated. upstream/1.7.0-29-g8f2f076

Bas Couwenberg sebastic at xs4all.nl
Fri Jan 10 19:30:53 UTC 2014 

The following commit has been merged in the master branch:
commit f48c901e3572ae1211f47b4ab789395295aa162d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 10 19:27:45 2014 +0100

    Update copyright file using copyright-format 1.0.

diff --git a/debian/changelog b/debian/changelog
index 60bc3ee..61d62c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ spatialindex (1.8.1-1) UNRELEASED; urgency=low
   * Change library packages to match SONAME, and use correct description.
     (closes: #642482)
   * Add debug package for the shared library.
+  * Update copyright file using copyright-format 1.0.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 10 Jan 2014 16:38:53 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 675672f..b3fab25 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,57 +1,107 @@
-This package was debianized by Francesco Paolo Lovergine <frankie at debian.org> on
-Wed, 27 May 2009 20:29:47 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: libspatialindex
+Upstream-Contact: Marios Hadjieleftheriou <mhadji at gmail.com>
+Source: http://download.osgeo.org/libspatialindex/
 
-It was downloaded from https://github.com/libspatialindex/libspatialindex.git
+Files: *
+Copyright: 2002-2004, Marios Hadjieleftheriou
+License: MIT
 
-Upstream Authors:
+Files: include/spatialindex/capi/BoundsQuery.h
+ include/spatialindex/capi/DataStream.h
+ include/spatialindex/capi/Error.h
+ include/spatialindex/capi/IdVisitor.h
+ include/spatialindex/capi/Index.h
+ include/spatialindex/capi/LeafQuery.h
+ include/spatialindex/capi/ObjVisitor.h
+ include/spatialindex/capi/Utility.h
+ include/spatialindex/capi/sidx_api.h
+ include/spatialindex/capi/sidx_config.h
+ include/spatialindex/capi/sidx_impl.h
+ include/spatialindex/tools/rand48.h
+ src/capi/BoundsQuery.cc
+ src/capi/DataStream.cc
+ src/capi/Error.cc
+ src/capi/IdVisitor.cc
+ src/capi/Index.cc
+ src/capi/LeafQuery.cc
+ src/capi/ObjVisitor.cc
+ src/capi/Utility.cc
+ src/capi/sidx_api.cc
+Copyright: 2009, 2011, Howard Butler
+License: MIT
 
-		Marios Hadjieleftheriou <mhadji at gmail.com>
-		Howard Butler <hobu.inc at gmail.com>
+Files: include/spatialindex/capi/CountVisitor.h
+ src/capi/CountVisitor.cc
+Copyright: 2010, Leonard Norrgård
+License: MIT
 
-Copyright:
+Files: include/spatialindex/capi/CustomStorage.h
+ src/capi/CustomStorage.cc
+Copyright: 2010, Matthias (nitro)
+License: MIT
 
-    Copyright (C) 2002-2004 Navel Ltd.
-	Copyright (c) 1993 Martin Birgmeier.
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
+License: GPL-2.0+ with Libtool exception
 
-License:
+Files: src/tools/rand48.cc
+Copyright: 1993, Martin Birgmeier
+License: rand48
 
-    This package is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+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 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.
 
-    This package 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
-    Lesser General Public License for more details.
+License: rand48
+ Copyright (c) 1993 Martin Birgmeier
+ All rights reserved.
+ .
+ You may redistribute unmodified or modified versions of this source
+ code provided that the above copyright notice and this and the
+ following conditions are retained.
+ .
+ This software is provided ``as is'', and comes with no warranties
+ of any kind. I shall in no event be liable for anything that happens
+ to anyone/anything when using this software.
 
-    You should have received a copy of the GNU Lesser 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 GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-The Debian packaging is:
-
-    Copyright (C) 2009 Francesco Paolo Lovergine <frankie at debian.org>
-
-and is licensed under the GPL version 3, 
-see `/usr/share/common-licenses/GPL-3'.
-
-------------------------------------------------------------------------------
-The file srand48.cc is copyrighted by Martin Birgmeier with the following
-license:
-
-/*
-* Copyright (c) 1993 Martin Birgmeier
-* All rights reserved.
-*
-* You may redistribute unmodified or modified versions of this source
-* code provided that the above copyright notice and this and the
-* following conditions are retained.
-*
-* This software is provided ``as is'', and comes with no warranties
-* of any kind. I shall in no event be liable for anything that happens
-* to anyone/anything when using this software.
-*/
+License: GPL-2.0+ 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
+ (at your option) any later version.
+ .
+ As a special exception to the GNU General Public License,
+ if you distribute this file as part of a program or library that
+ is built using GNU Libtool, you may include this file under the
+ same distribution terms that you use for the rest of that program.
+ .
+ GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+ can be downloaded from http://www.gnu.org/licenses/gpl.html,
+ or obtained by writing to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.

-- 
A general framework for developing spatial indices

More information about the Pkg-grass-devel mailing list