feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: Add GPL_EXCEPTION.TXT and GPL_EXCEPTION_ADDENDUM.TXT

Browse Source
This commit is contained in:
dt
2008-12-16 16:27:09 +01:00
parent 4531a90c47
commit e8d1b3441c
2 changed files with 55 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
GPL_EXCEPTION.txt → GPL_EXCEPTION.TXT
View File

74
GPL_Exception_Addendum.txt → GPL_EXCEPTION_ADDENDUM.TXT
View File

@@ -1,5 +1,5 @@
Addendum to the Trolltech GPL Exception version 1.2 Addendum to the Nokia Corporation GPL Exception version 1.3
=================================================== ===========================================================
-------------------------------------------------------------------------- --------------------------------------------------------------------------
@@ -55,36 +55,36 @@ that you insert a prominent notice in each changed file stating how and
when you changed that file, and provided that you do at least ONE of the when you changed that file, and provided that you do at least ONE of the
following: following:
a) place your modifications in the Public Domain or otherwise make them a) place your modifications in the Public Domain or otherwise make them
Freely Available, such as by posting said modifications to Usenet or Freely Available, such as by posting said modifications to Usenet or
an equivalent medium, or placing the modifications on a major archive an equivalent medium, or placing the modifications on a major archive
site such as uunet.uu.net, or by allowing the Copyright Holder to include site such as uunet.uu.net, or by allowing the Copyright Holder to include
your modifications in the Standard Version of the Package. your modifications in the Standard Version of the Package.
b) use the modified Package only within your corporation or organization. b) use the modified Package only within your corporation or organization.
c) rename any non-standard executables so the names do not conflict c) rename any non-standard executables so the names do not conflict
with standard executables, which must also be provided, and provide with standard executables, which must also be provided, and provide
a separate manual page for each non-standard executable that clearly a separate manual page for each non-standard executable that clearly
documents how it differs from the Standard Version. documents how it differs from the Standard Version.
d) make other distribution arrangements with the Copyright Holder. d) make other distribution arrangements with the Copyright Holder.
4. You may distribute the programs of this Package in object code or 4. You may distribute the programs of this Package in object code or
executable form, provided that you do at least ONE of the following: executable form, provided that you do at least ONE of the following:
a) distribute a Standard Version of the executables and library files, a) distribute a Standard Version of the executables and library files,
together with instructions (in the manual page or equivalent) on where together with instructions (in the manual page or equivalent) on where
to get the Standard Version. to get the Standard Version.
b) accompany the distribution with the machine-readable source of b) accompany the distribution with the machine-readable source of
the Package with your modifications. the Package with your modifications.
c) give non-standard executables non-standard names, and clearly c) give non-standard executables non-standard names, and clearly
document the differences in manual pages (or equivalent), together document the differences in manual pages (or equivalent), together
with instructions on where to get the Standard Version. with instructions on where to get the Standard Version.
d) make other distribution arrangements with the Copyright Holder. d) make other distribution arrangements with the Copyright Holder.
5. You may charge a reasonable copying fee for any distribution of this 5. You may charge a reasonable copying fee for any distribution of this
Package. You may charge any fee you choose for support of this Package. You may charge any fee you choose for support of this
@@ -206,12 +206,12 @@ ADVISED OF THE POSSIBILITY THEREOF.
its terms and conditions. its terms and conditions.
7. This License Agreement shall be governed by and interpreted in all respects 7. This License Agreement shall be governed by and interpreted in all respects
by the law of the State of Virginia, excluding conflict of law provisions. by the law of the State of Virginia, excluding conflict of law
Nothing in this License Agreement shall be deemed to create any relationship of provisions. Nothing in this License Agreement shall be deemed to create any
agency, partnership, or joint venture between CNRI and Licensee. This License relationship of agency, partnership, or joint venture between CNRI and
Agreement does not grant permission to use CNRI trademarks or trade name in a Licensee. This License Agreement does not grant permission to use CNRI
trademark sense to endorse or promote products or services of Licensee, or any trademarks or trade name in a trademark sense to endorse or promote products or
third party. services of Licensee, or any third party.
8. By clicking on the "ACCEPT" button where indicated, or by copying, installing 8. By clicking on the "ACCEPT" button where indicated, or by copying, installing
or otherwise using Python 1.6b1, Licensee agrees to be bound by the terms and or otherwise using Python 1.6b1, Licensee agrees to be bound by the terms and
@@ -227,22 +227,14 @@ The zlib/libpng License
Copyright (c) <year> <copyright holders> Copyright (c) <year> <copyright holders>
This software is provided 'as-is', without any express or implied warranty. In This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
no event will the authors be held liable for any damages arising from the use of
this software.
Permission is granted to anyone to use this software for any purpose, including Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
commercial applications, and to alter it and redistribute it freely, subject to
the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
that you wrote the original software. If you use this software in a product, an
acknowledgment in the product documentation would be appreciated but is not
required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
-------------------------------------------------------------------------- --------------------------------------------------------------------------