From 0e1f5bd29a9f36c53d685bcfb3612ed64c959367 Mon Sep 17 00:00:00 2001 From: kennytm Date: Wed, 8 Jun 2016 00:30:47 +0800 Subject: [PATCH] Relicense as Apache-2 + MIT. Remove license footer (useless and awkward for dual licensing). --- Cargo.toml | 2 +- LICENSE => LICENSE-APACHE.txt | 0 LICENSE-MIT.txt | 19 +++++++++++++++++++ README.md | 2 +- src/bits.rs | 13 ------------- src/canvas.rs | 13 ------------- src/ec.rs | 13 ------------- src/lib.rs | 13 ------------- src/optimize.rs | 13 ------------- src/types.rs | 13 ------------- 10 files changed, 21 insertions(+), 80 deletions(-) rename LICENSE => LICENSE-APACHE.txt (100%) create mode 100644 LICENSE-MIT.txt diff --git a/Cargo.toml b/Cargo.toml index 8dc7dd6..e5defd4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "qrcode" description = "QR code encoder in Rust" -license = "Apache-2.0" +license = "MIT / Apache-2.0" version = "0.2.0" authors = ["kennytm "] keywords = ["qrcode"] diff --git a/LICENSE b/LICENSE-APACHE.txt similarity index 100% rename from LICENSE rename to LICENSE-APACHE.txt diff --git a/LICENSE-MIT.txt b/LICENSE-MIT.txt new file mode 100644 index 0000000..fa50b0a --- /dev/null +++ b/LICENSE-MIT.txt @@ -0,0 +1,19 @@ +Copyright (c) 2016 kennytm + +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. + diff --git a/README.md b/README.md index a822cc2..02acdf3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ qrcode-rust [![Build status](https://travis-ci.org/kennytm/qrcode-rust.svg?branch=master)](https://travis-ci.org/kennytm/qrcode-rust) [![Coverage Status](https://coveralls.io/repos/github/kennytm/qrcode-rust/badge.svg?branch=coveralls)](https://coveralls.io/github/kennytm/qrcode-rust?branch=coveralls) [![crates.io](http://meritbadge.herokuapp.com/qrcode)](https://crates.io/crates/qrcode) -[![Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](./LICENSE) +[![MIT / Apache 2.0](https://img.shields.io/badge/license-MIT%20%2f%20Apache%202.0-blue.svg)](./LICENSE-APACHE.txt) QR code and Micro QR code encoder in Rust. diff --git a/src/bits.rs b/src/bits.rs index cc33fb8..ff20504 100644 --- a/src/bits.rs +++ b/src/bits.rs @@ -894,17 +894,4 @@ mod encode_auto_tests { //}}} //------------------------------------------------------------------------------ -// Copyright 2014 Kenny Chan -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy of -// the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. diff --git a/src/canvas.rs b/src/canvas.rs index 5180863..beacdf1 100644 --- a/src/canvas.rs +++ b/src/canvas.rs @@ -1884,17 +1884,4 @@ impl Canvas { //}}} //------------------------------------------------------------------------------ -// Copyright 2014-2016 kennytm -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy of -// the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. diff --git a/src/ec.rs b/src/ec.rs index bc91d84..10e10b9 100644 --- a/src/ec.rs +++ b/src/ec.rs @@ -444,17 +444,4 @@ static DATA_BYTES_PER_BLOCK: [[(usize, usize, usize, usize); 4]; 44] = [ //}}} -// Copyright 2014-2016 kennytm -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy of -// the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. diff --git a/src/lib.rs b/src/lib.rs index 1fdabae..1685518 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -249,17 +249,4 @@ mod tests { } } -// Copyright 2014 Kenny Chan -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy of -// the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. diff --git a/src/optimize.rs b/src/optimize.rs index e79a185..017fe8a 100644 --- a/src/optimize.rs +++ b/src/optimize.rs @@ -676,17 +676,4 @@ static STATE_TRANSITION: [(State, Action); 70] = [ //}}} -// Copyright 2014 Kenny Chan -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy of -// the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. diff --git a/src/types.rs b/src/types.rs index 8327a66..fd14b8d 100644 --- a/src/types.rs +++ b/src/types.rs @@ -279,17 +279,4 @@ mod mode_tests { //}}} -// Copyright 2014 Kenny Chan -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy of -// the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License.