[Python-modules-commits] r32190 - in packages/python-aiohttp/trunk/debian (changelog copyright)

[tianon-guest at users.alioth.debian.org]

    Date: Saturday, April 4, 2015 @ 15:08:41
  Author: tianon-guest
Revision: 32190

Upstream switched to Apache-2 in 0.10.0 (https://github.com/KeepSafe/aiohttp/commit/a463c5cc4e7afdb49726ea77f3cac5d610710cad)

Modified:
  packages/python-aiohttp/trunk/debian/changelog
  packages/python-aiohttp/trunk/debian/copyright

Modified: packages/python-aiohttp/trunk/debian/changelog
===================================================================
--- packages/python-aiohttp/trunk/debian/changelog	2015-04-04 03:51:42 UTC (rev 32189)
+++ packages/python-aiohttp/trunk/debian/changelog	2015-04-04 15:08:41 UTC (rev 32190)
@@ -1,3 +1,9 @@
+python-aiohttp (0.15.1-2) UNRELEASED; urgency=medium
+
+  * Fix license in debian/copyright to match upstream's Apache-2 (since 0.10.0).
+
+ -- Tianon Gravi <admwiggin at gmail.com>  Sat, 04 Apr 2015 09:07:00 -0600
+
 python-aiohttp (0.15.1-1) unstable; urgency=medium
 
   * Initial release.

Modified: packages/python-aiohttp/trunk/debian/copyright
===================================================================
--- packages/python-aiohttp/trunk/debian/copyright	2015-04-04 03:51:42 UTC (rev 32189)
+++ packages/python-aiohttp/trunk/debian/copyright	2015-04-04 15:08:41 UTC (rev 32190)
@@ -2,34 +2,27 @@
 Source: https://github.com/KeepSafe/aiohttp
 
 Files: *
-Copyright: 2013-2014 Nikolay Kim
-           2013-2014 Andrew Svetlov
-License: BSD-2-clause
+Copyright: 2013-2015 Nikolay Kim
+           2013-2015 Andrew Svetlov
+License: Apache-2
 
 Files: debian/*
-Copyright: 2014 Tianon Gravi <admwiggin at gmail.com>
-License: BSD-2-clause
+Copyright: 2015 Tianon Gravi <admwiggin at gmail.com>,
+           2015 Piotr Ożarowski <piotr at debian.org>
+License: Apache-2
 
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
+License: Apache-2
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
  .
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ http://www.apache.org/licenses/LICENSE-2.0
  .
- 2. 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.
+ 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.
  .
- 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
- HOLDER 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.
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".