uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Updated license

Browse Source
This commit is contained in:
inmarket 2013-06-15 22:02:51 +10:00
parent 49b3e8f55a
commit a7c6117550
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
license.html
View File

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>GFX License, version 1.0</title> <title>GFX License, version 1.1</title>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
@ -67,7 +67,7 @@
</style> </style>
</head> </head>
<body> <body>
<h1>GFX License<br>Version 1.0</h1> <h1>GFX License<br>Version 1.1</h1>
<h2>1. Definitions</h2> <h2>1. Definitions</h2>
<dl> <dl>
<dt>1.1. Works</dt> <dt>1.1. Works</dt>
@ -76,7 +76,7 @@
<dd><p>means each individual or legal entity that creates, contributes to the creation of the Works.</p></dd> <dd><p>means each individual or legal entity that creates, contributes to the creation of the Works.</p></dd>
<dt>1.3. Contribution</dt> <dt>1.3. Contribution</dt>
<dd><p>means Software of a particular Contributor that has been offered to form part of the Works.</p></dd> <dd><p>means Software of a particular Contributor that has been offered to form part of the Works.</p></dd>
<dt>1.4. Executable Form</dt> <dt>1.4. Executable form</dt>
<dd><p>means any form of the Works other than Source Code Form.</p></dd> <dd><p>means any form of the Works other than Source Code Form.</p></dd>
<dt>1.5. Application</dt> <dt>1.5. Application</dt>
<dd><p>means a work or software that combines the Works with other material, in a separate file or files whether in executable format or in library format, as Software or on a device.</p></dd> <dd><p>means a work or software that combines the Works with other material, in a separate file or files whether in executable format or in library format, as Software or on a device.</p></dd>
@ -104,27 +104,28 @@
</dl> </dl>
<h2>2. Non Commercial Use</h2> <h2>2. Non Commercial Use</h2>
<h3>2.1. Distribution of Source Form</h3> <h3>2.1. Distribution of source form</h3>
<p>If You distribute the Works in an Source Form then:</p> <p>If You distribute the Works in an source form then:</p>
<ol type="a"> <ol type="a">
<li><p>All distribution of the Works in Source Code Form, including any Modifications that You create or to which You contribute, must be under the terms of this License; and</p></li> <li><p>All distribution of the Works in Source Code Form, including any Modifications that You create or to which You contribute, must be under the terms of this License; and</p></li>
<li><p>You must inform recipients that the Source Code Form of the Works is governed by the terms of this License, and how they can obtain a copy of this License. You may not attempt to alter the recipients rights in the Source Code Form; and</p></li> <li><p>You must inform recipients that the Source Code Form of the Works is governed by the terms of this License, and how they can obtain a copy of this License. You may not attempt to alter the recipients rights in the Source Code Form; and</p></li>
<li><p>Any modification to the Works must be contributed to the License Owners as per Section 4 prior to distribution; and</p></li> <li><p>Any modification to the Works must be contributed to the License Owners as per Section 4 prior to distribution; and</p></li>
<li><p>Source Code not forming part of the Works that are distributed in conjunction with the Works do not need to be contributed to the License Owners or use this License.</p></li> <li><p>source code not forming part of the Works that are distributed in conjunction with the Works do not need to be contributed to the License Owners or use this License.</p></li>
</ol> </ol>
<h3>2.2. Distribution of Executable Form</h3> <i><p>Note: This means that you must contribute changes you make to the library, you do not need to contribute your application or any other code outside of GFX library itself.</p></i>
<p>If You distribute the Works in an Executable Form then:</p> <h3>2.2. Distribution of Executable form</h3>
<p>If You distribute the Works in an Executable form then:</p>
<ol type="a"> <ol type="a">
<li><p>and You must inform recipients of the Executable Form that it contains the Works and how they can obtain a copy of the Works in Source Code Form from the License Owners master repository; and</p></li> <li><p>and You must inform recipients of the Executable form that it contains the Works and how they can obtain a copy of the Works in Source Code Form from the License Owners master repository; and</p></li>
<li><p>Any modification to the Works must be contributed to the License Owners as per Section 4 prior to distribution; and</p></li> <li><p>Any modification to the Works must be contributed to the License Owners as per Section 4 prior to distribution; and</p></li>
<li><p>You may distribute such Executable Form under the terms of this License, or license it under different terms, provided that the license for the Executable Form does not allow for Commercial Use of the Works or attempt to limit or alter the recipients' rights in the Source Code Form under this License.</p></li> <li><p>You may distribute such Executable form under the terms of this License, or license it under different terms, provided that the license for the Executable form does not allow for Commercial Use of the Works or attempt to limit or alter the recipients' rights in the Source Code Form under this License.</p></li>
</ol> </ol>
<h2>3. Commercial Use</h2> <h2>3. Commercial Use</h2>
<h3>3.1. Commercial Use Agreement</h3> <h3>3.1. Commercial Use Agreement</h3>
<p>A "Commercial Use Agreement" explicitly signed by the License Owner will override any specified terms of this License for the party to the agreement under the terms of the agreement. All other terms of this License will still apply.</p> <p>A "Commercial Use Agreement" explicitly signed by the License Owner will override any specified terms of this License for the party to the agreement under the terms of the agreement. All other terms of this License will still apply.</p>
<h3>3.2. Distribution</h3> <h3>3.2. Distribution</h3>
<p>Other than as provided for in a signed "Commercial Use Agreement", where there is a Commercial Use involved or implied; you are not permitted to distribute the Works, in any form, either in Source Code or Executable Form, <p>Other than as provided for in a signed "Commercial Use Agreement", where there is a Commercial Use involved or implied; you are not permitted to distribute the Works, in any form, either in source code or Executable form,
either as software or on a device or in any other way.</p> either as software or on a device or in any other way.</p>
<h2>4. Contributions</h2> <h2>4. Contributions</h2>
@ -147,7 +148,10 @@
<p>Each Contributor represents that the Contributor believes its Contributions are its original creation(s) or it has sufficient rights to grant the rights to its Contributions conveyed by this License. Each Contributor accepts sole responsibility for the legal position of its Contribution and holds blameless the License Owners for such Contribution or any modification to it.</p> <p>Each Contributor represents that the Contributor believes its Contributions are its original creation(s) or it has sufficient rights to grant the rights to its Contributions conveyed by this License. Each Contributor accepts sole responsibility for the legal position of its Contribution and holds blameless the License Owners for such Contribution or any modification to it.</p>
<h3>4.5. Deeming of Contributions</h3> <h3>4.5. Deeming of Contributions</h3>
<p>Each Contributor deems that by Contributing to the Works, through any method offered by the License Owners, irrespective of the license provided in the Contribution, is agreeing to the Contribution being licensed under this License with its Grants, Scope and Representation.</p> <p>Each Contributor deems that by Contributing to the Works, through any method offered by the License Owners, irrespective of the license provided in the Contribution, is agreeing to the Contribution being licensed under this License with its Grants, Scope and Representation.</p>
<h3>4.6. Additional Rights</h3> <h3>4.6. Original Source Rights</h3>
<p>By contributing to the Works, the Contributor is not removing their own copyright in their original work. The original work retains all existing copyrights and other rights, except the rights as described above have been granted to the license owners on the copy of the contribution as contributed.</p>
<p>This is equivelent to the "forking" of the contribution to two different licenses, one as part of the works (GFX) and the other as in its original form.</p>
<h3>4.7. Additional Rights</h3>
<p>A Contribution does not convey any extra distribution rights for the Contributor to the Works under this license.</p> <p>A Contribution does not convey any extra distribution rights for the Contributor to the Works under this license.</p>
@ -175,14 +179,14 @@
<p>If you create software not governed by this License, and you want to create a new license for such software, you may create and use a modified version of this License if you rename the license and remove any references to the name of the License Owner (except to note that such modified license differs from this License).</p> <p>If you create software not governed by this License, and you want to create a new license for such software, you may create and use a modified version of this License if you rename the license and remove any references to the name of the License Owner (except to note that such modified license differs from this License).</p>
<h2>Exhibit A - Source Code Form License Notice</h2> <h2>Exhibit A - Source Code Form License Notice</h2>
<pre> <pre>
/* /*
* This file is subject to the terms of the GFX License, v1.0. If a copy of * This file is subject to the terms of the GFX License. If a copy of
* the license was not distributed with this file, you can obtain one at: * the license was not distributed with this file, you can obtain one at:
* *
* http://chibios-gfx.com/license.html * http://chibios-gfx.com/license.html
*/ */
</pre> </pre>
<p>If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.</p> <p>If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.</p>
</body> </body>
</html> </html>