[DebianGIS-dev] [SCM] tilecache branch, master, updated. debian/2.03-1.4-11-g2f2c993

Sat Nov 6 09:33:57 UTC 2010

The following commit has been merged in the master branch:
commit 2f2c9931fe8d64a842c4b37fd61a5a6991989649
Author: David Paleino <dapal at debian.org>
Date:   Sat Nov 6 10:33:34 2010 +0100

    debian/copyright updated to DEP-5, added missing info

diff --git a/debian/changelog b/debian/changelog
index 40a3b3a..436975d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ tilecache (2.11-1) UNRELEASED; urgency=low
     - B-D-I field rewrapped
     - Vcs-* fields added
     - binary Depends, Recommends and Suggests fields rewrapped
+  * debian/copyright updated to DEP-5, added missing info
 
- -- David Paleino <dapal at debian.org>  Sat, 06 Nov 2010 10:23:51 +0100
+ -- David Paleino <dapal at debian.org>  Sat, 06 Nov 2010 10:33:22 +0100
 
 tilecache (2.03-1.4) unstable; urgency=high
 
diff --git a/debian/copyright b/debian/copyright
index df7232a..cb316f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,32 +1,59 @@
-This package was debianized by Christopher Schmidt <crschmidt at metacarta.com> on
-Sat, 22 Dec 2007 19:54:25 -0500.
+Format-Specification: http://dep.debian.net/deps/dep5
 
-It was downloaded from http://tilecache.org/
+Files: *
+Copyright: © 2006-2010, TileCache Contributors
+License: BSD-3
 
-Copyright Holder: Copyright (c) 2006-2007 MetaCarta, Inc.
+Files: debian/*
+Copyright: © 2007-2008, Christopher Schmidt <crschmidt at metacarta.com>
+ © 2010, David Paleino <dapal at debian.org>
+License: BSD-3
 
-License:
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Files: tests/tests.py
+Copyright: © 2007, Sean C. Gillies
+License: BSD-3
+X-Comment: the license is the one found in
+ http://trac.gispython.org/lab/browser/Shapely/trunk/LICENSE.txt
 
-  * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
+Files: TileCache/Caches/S3.py
+Copyright: © 2006-2008, Amazon Digital Services, Inc. or its affiliates
+License: other
 
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
+License: BSD-3
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+   * Redistributions of source code must retain the above copyright notice, this
+     list of conditions and the following disclaimer.
+ .
+   * Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+ .
+   * Neither the name of MetaCarta, Inc. nor the names of its contributors
+     may be used to endorse or promote products derived from this software
+     without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN 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.
 
-  * Neither the name of MetaCarta, Inc. nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN 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: other
+ #  This software code is made available "AS IS" without warranties of any
+ #  kind.  You may copy, display, modify and redistribute the software
+ #  code either by itself or as incorporated into your code; provided that
+ #  you do not remove any proprietary notices.  Your use of this software
+ #  code is at your own risk and you waive any claim against Amazon
+ #  Digital Services, Inc. or its affiliates with respect to your use of
+ #  this software code. (c) 2006-2008 Amazon Digital Services, Inc. or its
+ #  affiliates.
+X-Comment: http://aws.amazon.com/code/134 states that this software is
+ under 'New BSD', but the code carries this notice. Nevertheless, it's
+ DFSG-free.

-- 
a web map tile caching system

