Skip to content

Commit a4e2320

Browse files
lukespragglukespragg
committed
Switch to straight MIT for license
1 parent 1355b5b commit a4e2320

File tree

2 files changed

+28
-228
lines changed

2 files changed

+28
-228
lines changed

‎HEADER.txt‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1-
This file is part of ${name}.
1+
This file is part of ${project}, licensed under the MIT License (MIT).
22

3-
Copyright (c) ${inceptionYear} ${organization} <${url}/>
4-
${name} is licensed under the Spout License Version 1.
3+
Copyright (c) ${year} ${name} <${url}/>
54

6-
${name} is free software: you can redistribute it and/or modify it under
7-
the terms of the GNU Lesser General Public License as published by the Free
8-
Software Foundation, either version 3 of the License, or (at your option)
9-
any later version.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
1011

11-
In addition, 180 days after any changes are published, you can use the
12-
software, incorporating those changes, under the terms of the MIT license,
13-
as described in the Spout License Version 1.
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
1414

15-
${name} is distributed in the hope that it will be useful, but WITHOUT ANY
16-
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
17-
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
18-
more details.
19-
20-
You should have received a copy of the GNU Lesser General Public License,
21-
the MIT license and the Spout License Version 1 along with this program.
22-
If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
23-
License and see <http://spout.in/licensev1> for the full license, including
24-
the MIT license.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎LICENSE.txt‎

Lines changed: 11 additions & 208 deletions
Original file line numberDiff line numberDiff line change
@@ -1,216 +1,19 @@
1-
The dual license described in this file is called the Spout License Version 1.
1+
The MIT License (MIT)
22

3-
-----------------------------------------------------------------------
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of
4+
this software and associated documentation files (the "Software"), to deal in
5+
the Software without restriction, including without limitation the rights to
6+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
7+
of the Software, and to permit persons to whom the Software is furnished to do
8+
so, subject to the following conditions:
49

5-
The software is licensed under the GNU Lesser General Public License Version 3.
6-
7-
In addition, the software as it existed no less than 180 days previously,
8-
is licensed under the MIT License. For clarity, files in a state that
9-
includes changes published less than 180 days previously are NOT licensed
10-
under the MIT license. However, files in a state that only includes changes
11-
published more than 180 days previously are licensed under the MIT license.
12-
13-
The files originating from the Glowstone and Lightstone projects were
14-
licensed by their respective authors under the MIT License. However, any
15-
subsequent changes made as part of this project are licensed in accordance
16-
with the dual license as described in this text.
17-
18-
The GNU Lesser General Public License Version 3 and the MIT License, including
19-
copyright notice relating to the Glowstone and Lightstone projects, are
20-
provided below.
21-
22-
-----------------------------------------------------------------------
23-
24-
GNU LESSER GENERAL PUBLIC LICENSE
25-
Version 3, 29 June 2007
26-
27-
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
28-
Everyone is permitted to copy and distribute verbatim copies
29-
of this license document, but changing it is not allowed.
30-
31-
32-
This version of the GNU Lesser General Public License incorporates
33-
the terms and conditions of version 3 of the GNU General Public
34-
License, supplemented by the additional permissions listed below.
35-
36-
0. Additional Definitions.
37-
38-
As used herein, "this License" refers to version 3 of the GNU Lesser
39-
General Public License, and the "GNU GPL" refers to version 3 of the GNU
40-
General Public License.
41-
42-
"The Library" refers to a covered work governed by this License,
43-
other than an Application or a Combined Work as defined below.
44-
45-
An "Application" is any work that makes use of an interface provided
46-
by the Library, but which is not otherwise based on the Library.
47-
Defining a subclass of a class defined by the Library is deemed a mode
48-
of using an interface provided by the Library.
49-
50-
A "Combined Work" is a work produced by combining or linking an
51-
Application with the Library. The particular version of the Library
52-
with which the Combined Work was made is also called the "Linked
53-
Version".
54-
55-
The "Minimal Corresponding Source" for a Combined Work means the
56-
Corresponding Source for the Combined Work, excluding any source code
57-
for portions of the Combined Work that, considered in isolation, are
58-
based on the Application, and not on the Linked Version.
59-
60-
The "Corresponding Application Code" for a Combined Work means the
61-
object code and/or source code for the Application, including any data
62-
and utility programs needed for reproducing the Combined Work from the
63-
Application, but excluding the System Libraries of the Combined Work.
64-
65-
1. Exception to Section 3 of the GNU GPL.
66-
67-
You may convey a covered work under sections 3 and 4 of this License
68-
without being bound by section 3 of the GNU GPL.
69-
70-
2. Conveying Modified Versions.
71-
72-
If you modify a copy of the Library, and, in your modifications, a
73-
facility refers to a function or data to be supplied by an Application
74-
that uses the facility (other than as an argument passed when the
75-
facility is invoked), then you may convey a copy of the modified
76-
version:
77-
78-
a) under this License, provided that you make a good faith effort to
79-
ensure that, in the event an Application does not supply the
80-
function or data, the facility still operates, and performs
81-
whatever part of its purpose remains meaningful, or
82-
83-
b) under the GNU GPL, with none of the additional permissions of
84-
this License applicable to that copy.
85-
86-
3. Object Code Incorporating Material from Library Header Files.
87-
88-
The object code form of an Application may incorporate material from
89-
a header file that is part of the Library. You may convey such object
90-
code under terms of your choice, provided that, if the incorporated
91-
material is not limited to numerical parameters, data structure
92-
layouts and accessors, or small macros, inline functions and templates
93-
(ten or fewer lines in length), you do both of the following:
94-
95-
a) Give prominent notice with each copy of the object code that the
96-
Library is used in it and that the Library and its use are
97-
covered by this License.
98-
99-
b) Accompany the object code with a copy of the GNU GPL and this license
100-
document.
101-
102-
4. Combined Works.
103-
104-
You may convey a Combined Work under terms of your choice that,
105-
taken together, effectively do not restrict modification of the
106-
portions of the Library contained in the Combined Work and reverse
107-
engineering for debugging such modifications, if you also do each of
108-
the following:
109-
110-
a) Give prominent notice with each copy of the Combined Work that
111-
the Library is used in it and that the Library and its use are
112-
covered by this License.
113-
114-
b) Accompany the Combined Work with a copy of the GNU GPL and this license
115-
document.
116-
117-
c) For a Combined Work that displays copyright notices during
118-
execution, include the copyright notice for the Library among
119-
these notices, as well as a reference directing the user to the
120-
copies of the GNU GPL and this license document.
121-
122-
d) Do one of the following:
123-
124-
0) Convey the Minimal Corresponding Source under the terms of this
125-
License, and the Corresponding Application Code in a form
126-
suitable for, and under terms that permit, the user to
127-
recombine or relink the Application with a modified version of
128-
the Linked Version to produce a modified Combined Work, in the
129-
manner specified by section 6 of the GNU GPL for conveying
130-
Corresponding Source.
131-
132-
1) Use a suitable shared library mechanism for linking with the
133-
Library. A suitable mechanism is one that (a) uses at run time
134-
a copy of the Library already present on the user's computer
135-
system, and (b) will operate properly with a modified version
136-
of the Library that is interface-compatible with the Linked
137-
Version.
138-
139-
e) Provide Installation Information, but only if you would otherwise
140-
be required to provide such information under section 6 of the
141-
GNU GPL, and only to the extent that such information is
142-
necessary to install and execute a modified version of the
143-
Combined Work produced by recombining or relinking the
144-
Application with a modified version of the Linked Version. (If
145-
you use option 4d0, the Installation Information must accompany
146-
the Minimal Corresponding Source and Corresponding Application
147-
Code. If you use option 4d1, you must provide the Installation
148-
Information in the manner specified by section 6 of the GNU GPL
149-
for conveying Corresponding Source.)
150-
151-
5. Combined Libraries.
152-
153-
You may place library facilities that are a work based on the
154-
Library side by side in a single library together with other library
155-
facilities that are not Applications and are not covered by this
156-
License, and convey such a combined library under terms of your
157-
choice, if you do both of the following:
158-
159-
a) Accompany the combined library with a copy of the same work based
160-
on the Library, uncombined with any other library facilities,
161-
conveyed under the terms of this License.
162-
163-
b) Give prominent notice with the combined library that part of it
164-
is a work based on the Library, and explaining where to find the
165-
accompanying uncombined form of the same work.
166-
167-
6. Revised Versions of the GNU Lesser General Public License.
168-
169-
The Free Software Foundation may publish revised and/or new versions
170-
of the GNU Lesser General Public License from time to time. Such new
171-
versions will be similar in spirit to the present version, but may
172-
differ in detail to address new problems or concerns.
173-
174-
Each version is given a distinguishing version number. If the
175-
Library as you received it specifies that a certain numbered version
176-
of the GNU Lesser General Public License "or any later version"
177-
applies to it, you have the option of following the terms and
178-
conditions either of that published version or of any later version
179-
published by the Free Software Foundation. If the Library as you
180-
received it does not specify a version number of the GNU Lesser
181-
General Public License, you may choose any version of the GNU Lesser
182-
General Public License ever published by the Free Software Foundation.
183-
184-
If the Library as you received it specifies that a proxy can decide
185-
whether future versions of the GNU Lesser General Public License shall
186-
apply, that proxy's public statement of acceptance of any version is
187-
permanent authorization for you to choose that version for the
188-
Library.
189-
190-
-----------------------------------------------------------------------
191-
192-
For information purposes, the license file from the Glowstone project
193-
follows. This is the license referred to as the MIT license in the
194-
first paragraph.
195-
196-
Glowstone Copyright (C) 2011 Tad Hardesty.
197-
Lightstone Copyright (C) 2010-2011 Graham Edgecombe.
198-
Spout Copyright (C) 2011-2012 Spout LLC.
199-
200-
Permission is hereby granted, free of charge, to any person obtaining a copy
201-
of this software and associated documentation files (the "Software"), to deal
202-
in the Software without restriction, including without limitation the rights
203-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
204-
copies of the Software, and to permit persons to whom the Software is
205-
furnished to do so, subject to the following conditions:
206-
207-
The above copyright notice and this permission notice shall be included in
208-
all copies or substantial portions of the Software.
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
20912

21013
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21114
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21215
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21316
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21417
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
215-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
216-
THE SOFTWARE.
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

0 commit comments

Comments
 (0)