This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository tilecache.
commit b79bb7d7eb0399f8235703f11f78d1ec10f556fc
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Aug 24 19:35:48 2015 +0200
Update copyright file using copyright-format 1.0.
---
debian/changelog | 1 +
debian/copyright | 60 +++++++++++++++++++++++++++++++-------------------------
2 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b8d1c25..fe169b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ tilecache (2.11-3) UNRELEASED; urgency=medium
- Update Vcs-* fields to use canonical URLs
* Add upstream metadata.
* Bump debhelper compatibility to 9.
+ * Update copyright file using copyright-format 1.0.
-- Bas Couwenberg <sebas...@debian.org> Mon, 24 Aug 2015 19:09:10 +0200
diff --git a/debian/copyright b/debian/copyright
index cb316f2..7bac4f8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,43 @@
-Format-Specification: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: TileCache
+Upstream-Contact: TileCache Developers <tileca...@lists.osgeo.org>
+Source: http://tilecache.org/
Files: *
-Copyright: © 2006-2010, TileCache Contributors
-License: BSD-3
+Copyright: 2006-2010, TileCache Contributors
+License: BSD-3-Clause
-Files: debian/*
-Copyright: © 2007-2008, Christopher Schmidt <crschm...@metacarta.com>
- © 2010, David Paleino <da...@debian.org>
-License: BSD-3
+Files: TileCache/Caches/S3.py
+Copyright: 2006-2008, Amazon Digital Services, Inc. or its affiliates
+Comment: This code is downloaded as part of the "Amazon S3 Library for REST in
Python"
+
http://developer.amazonwebservices.com/connect/entry.jspa?externalID=134&categoryID=47
+ It is taken verbatim from that download.
+ .
+ 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.
+License: S3
+ 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.
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
+Copyright: 2007, Sean C. Gillies
+Comment: code taken from Shapely:
+ https://raw.githubusercontent.com/Toblerity/Shapely/master/LICENSE.txt
+License: BSD-3-Clause
-Files: TileCache/Caches/S3.py
-Copyright: © 2006-2008, Amazon Digital Services, Inc. or its affiliates
-License: other
+Files: debian/*
+Copyright: 2007-2008, Christopher Schmidt <crschm...@metacarta.com>
+ 2010, David Paleino <da...@debian.org>
+License: BSD-3-Clause
-License: BSD-3
+License: BSD-3-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
@@ -45,15 +63,3 @@ License: BSD-3
(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.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/tilecache.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
