diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-06 13:37:54 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-06 13:37:54 -0300 |
commit | a48d075b90120462b9f97ab95a224d47e072f7dd (patch) | |
tree | 8ba729381a11d91f09b298d888636425c549498b /libre/python2-libre/doc_license_change.patch | |
parent | 4ce84837520f8c56ae998d5d2d98380faf3e3eb5 (diff) | |
parent | 8ab3c2d0517cb4db3ab2f7635d0b71b701e464ba (diff) |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre/python2-libre/doc_license_change.patch')
-rw-r--r-- | libre/python2-libre/doc_license_change.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/libre/python2-libre/doc_license_change.patch b/libre/python2-libre/doc_license_change.patch deleted file mode 100644 index 18f9447d7..000000000 --- a/libre/python2-libre/doc_license_change.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- Doc/library/profile.rst 2011-06-11 12:46:23.000000000 -0300 -+++ Doc/library/profile.rst.orig 2011-08-12 11:35:25.000000000 -0300 -@@ -12,27 +12,23 @@ - - .. index:: single: InfoSeek Corporation - --Copyright © 1994, by InfoSeek Corporation, all rights reserved. -+Copyright Disney Enterprises, Inc. All Rights Reserved. - - Written by James Roskind. [#]_ - --Permission to use, copy, modify, and distribute this Python software and its --associated documentation for any purpose (subject to the restriction in the --following sentence) without fee is hereby granted, provided that the above --copyright notice appears in all copies, and that both that copyright notice and --this permission notice appear in supporting documentation, and that the name of --InfoSeek not be used in advertising or publicity pertaining to distribution of --the software without specific, written prior permission. This permission is --explicitly restricted to the copying and modification of the software to remain --in Python, compiled Python, or other languages (such as C) wherein the modified --or derived code is exclusively imported into a Python module. -- --INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, --INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT --SHALL INFOSEEK CORPORATION 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. -+Licensed to PSF under a Contributor Agreement -+ -+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 -+ -+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. - - .. _profiler-introduction: - |