From b9da1f4c56ff03545f77d1983c02432cb1bdd4c0 Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: Tue, 16 Jun 2015 02:13:19 +0200 Subject: [PATCH] Match license text to license='Apache 2.0' in setup.py --- LICENSE.txt | 30 +++++++++--------------------- MANIFEST.in | 1 + 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 180e718..e10c8a1 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,25 +1,13 @@ Copyright 2014 Roland Hedberg. All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are -permitted provided that the following conditions are met: +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. - -THIS SOFTWARE IS PROVIDED BY Roland Hedberg ``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 Roland Hedberg 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. - -The views and conclusions contained in the software and documentation are those of the -authors and should not be interpreted as representing official policies, either expressed -or implied of their employers. +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. diff --git a/MANIFEST.in b/MANIFEST.in index e203897..d2ebadc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,5 @@ include INSTALL +include LICENSE.txt include README include TODO recursive-include tests *