From 723532d61dca4222ef77762e43749deb569314b4 Mon Sep 17 00:00:00 2001 From: Christopher Cole Date: Tue, 12 Jan 2016 03:43:15 +0000 Subject: [PATCH] Relicense under dual MIT/Apache-2.0 The Robigalia project wants to include rust-elf. Relicensing at their behest. --- COPYRIGHT | 12 ++++++++++++ Cargo.toml | 2 +- LICENSE => LICENSE-APACHE | 2 +- LICENSE-MIT | 25 +++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 COPYRIGHT rename LICENSE => LICENSE-APACHE (99%) create mode 100644 LICENSE-MIT diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000..767cb81 --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,12 @@ +rust-elf is licensed under either of + + * Apache License, Version 2.0 (LICENSE-APACHE or + http://www.apache.org/licenses/LICENSE-2.0) + * MIT license ([LICENSE-MIT](LICENSE-MIT) or + http://opensource.org/licenses/MIT) + +at your option. + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall +be dual licensed as above, without any additional terms or conditions. diff --git a/Cargo.toml b/Cargo.toml index 715308b..da5edf5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "elf" version = "0.0.5" authors = ["Christopher Cole "] -license = "Apache-2.0" +license = "MIT/Apache-2.0" homepage = "https://github.com/cole14/rust-elf/" repository = "https://github.com/cole14/rust-elf/" documentation = "http://cole14.github.io/rust-elf/" diff --git a/LICENSE b/LICENSE-APACHE similarity index 99% rename from LICENSE rename to LICENSE-APACHE index e06d208..ebe4b41 100644 --- a/LICENSE +++ b/LICENSE-APACHE @@ -186,7 +186,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright 2016 Christopher Cole Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 0000000..cdd6fa3 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2016 Christopher Cole + +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE.