Skip to content

Commit 6b35d17

Browse files
committedJan 3, 2016
Merge pull request #3548 from rubinius/relicense
Break up old/new license & clarify what we use
2 parents 93c84d3 + 243c0b2 commit 6b35d17

File tree

4 files changed

+33
-32
lines changed

4 files changed

+33
-32
lines changed
 

‎BSD_LICENSE

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
BSD 3-clause License
2+
3+
Copyright (c) 2007-2015, Evan Phoenix and contributors
4+
All rights reserved.
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions are met:
8+
9+
* Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
11+
* Redistributions in binary form must reproduce the above copyright notice
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
14+
* Neither the name of Rubinius nor the names of its contributors
15+
may be used to endorse or promote products derived from this software
16+
without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
22+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎LICENSE

-28
Original file line numberDiff line numberDiff line change
@@ -362,31 +362,3 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
362362
This Source Code Form is "Incompatible
363363
With Secondary Licenses", as defined by
364364
the Mozilla Public License, v. 2.0.
365-
366-
BSD 3-clause License
367-
368-
Copyright (c) 2007-2015, Evan Phoenix and contributors
369-
All rights reserved.
370-
371-
Redistribution and use in source and binary forms, with or without
372-
modification, are permitted provided that the following conditions are met:
373-
374-
* Redistributions of source code must retain the above copyright notice, this
375-
list of conditions and the following disclaimer.
376-
* Redistributions in binary form must reproduce the above copyright notice
377-
this list of conditions and the following disclaimer in the documentation
378-
and/or other materials provided with the distribution.
379-
* Neither the name of Rubinius nor the names of its contributors
380-
may be used to endorse or promote products derived from this software
381-
without specific prior written permission.
382-
383-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
384-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
385-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
386-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
387-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
388-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
389-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
390-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
391-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
392-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎README

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ The following Ruby features are not supported on Rubinius:
3535

3636
3. License
3737

38-
Rubinius uses the MPL-2.0 license. See LICENSE for details.
39-
38+
Rubinius uses the MPL-2.0 license. See LICENSE for details. Contributions made
39+
prior to January 3rd, 2016 are licensed under the old BSD 3-clause license. A
40+
copy of this license can be found in the file "BSD_LICENSE".
4041

4142
4. Installing Rubinius from Source
4243

‎README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ The following Ruby features are not supported on Rubinius:
3333

3434
### License
3535

36-
Rubinius uses the MPL-2.0 license. See LICENSE for details.
37-
36+
Rubinius uses the MPL-2.0 license. See LICENSE for details. Contributions made
37+
prior to January 3rd, 2016 are licensed under the old BSD 3-clause license. A
38+
copy of this license can be found in the file "BSD_LICENSE".
3839

3940
### Installing Rubinius from Source
4041

0 commit comments

Comments
 (0)
Please sign in to comment.