From bbe639d0cde6e70c64b8abb70e6725ae922c931b Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Sun, 20 Jan 2013 22:04:56 +0000 Subject: Updated debian/copyright to reflect upstream switch to Apache 2.0 and updated copyright years --- debian/changelog | 5 ++++- debian/copyright | 60 ++++++++++++++++++++------------------------------------ 2 files changed, 25 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index b610e5b..3b2d044 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ requests (1.1.0-1) UNRELEASED; urgency=low anymore - Removed python-gevent and python-oauthlib from Recommends since upstream is not using them anymore + * debian/copyright + - Updated to reflect upstream switch to Apache 2.0 and updated + copyright years * debian/patches/01_do-not-use-python-certifi.patch - Removed because no longer necessary * debian/patches/02_do-not-use-embedded-python-six.patch @@ -21,7 +24,7 @@ requests (1.1.0-1) UNRELEASED; urgency=low - Use the system python-chardet and python-urllib3 instead of the embedded copies - -- Daniele Tricoli Sat, 19 Jan 2013 08:33:10 +0100 + -- Daniele Tricoli Sun, 20 Jan 2013 23:03:45 +0100 requests (0.12.1-1) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 5cbc66a..61fec45 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,16 +4,16 @@ Upstream-Contact: Kenneth Reitz Source: http://pypi.python.org/pypi/requests Files: * -Copyright: 2011-2012, Kenneth Reitz -License: ISC +Copyright: 2011-2013, Kenneth Reitz +License: Apache Files: requests/packages/urllib3/* Copyright: 2008-2011, Andrey Petrov License: Expat -Files: requests/packages/urllib3/packages/mimetools_choose_boundary/__init__.py -Copyright: 2010, Python Software Foundation -License: PSF-2 +Files: requests/packages/urllib3/packages/ordered_dict.py +Copyright: 2009, Raymond Hettinger +License: Expat Files: requests/packages/urllib3/packages/ssl_match_hostname/__init__.py Copyright: 2011, Python Software Foundation @@ -23,43 +23,25 @@ Files: requests/packages/urllib3/packages/six.py Copyright: 2010-2011, Benjamin Peterson License: Expat -Files: requests/packages/oreos/monkeys.py -Copyright: 2000, Timothy O'Malley -License: - Permission to use, copy, modify, and distribute this software - and its documentation for any purpose and 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, and that the name of - Timothy O'Malley not be used in advertising or publicity - pertaining to distribution of the software without specific, written - prior permission. - . - Timothy O'Malley DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS, IN NO EVENT SHALL Timothy O'Malley BE LIABLE FOR - ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. - Files: debian/* -Copyright: 2011-2012, Daniele Tricoli -License: ISC +Copyright: 2011-2013, Daniele Tricoli +License: Apache -License: ISC - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. +License: Apache + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this software except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. . - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. + On Debian systems, the full text of the Apache License, Version 2.0 can be + found in the file `/usr/share/common-licenses/Apache-2.0'. License: Expat Permission is hereby granted, free of charge, to any person obtaining -- cgit v1.2.3