From 2f1ddc75afde35e69ccf175b5fe4364b1df5bbe9 Mon Sep 17 00:00:00 2001 From: Seokpil Park Date: Mon, 29 Apr 2013 15:58:53 +0900 Subject: [PATCH] [appfw] Change Flora license version Change-Id: Id14030157e97d0eae26120fd95d427176d9fa223 Signed-off-by: Seokpil Park --- LICENSE.Flora | 27 ++++++++++++++------------- NOTICE | 4 ++-- inc/FIoSerialPort.h | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/LICENSE.Flora b/LICENSE.Flora index 7923a74..571fe79 100644 --- a/LICENSE.Flora +++ b/LICENSE.Flora @@ -1,6 +1,6 @@ Flora License -Version 1.0, April, 2013 +Version 1.1, April, 2013 http://floralicense.org/license/ @@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions: Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only - and do not modify the License. - -You may add Your own attribution notices within Derivative Works -that You distribute, alongside or as an addendum to the NOTICE text -from the Work, provided that such additional attribution notices -cannot be construed as modifying the License. You may add Your own -copyright statement to Your modifications and may provide additional or -different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works -as a whole, provided Your use, reproduction, and distribution of -the Work otherwise complies with the conditions stated in this License. + and do not modify the License. You may add Your own attribution notices + within Derivative Works that You distribute, alongside or as an addendum + to the NOTICE text from the Work, provided that such additional attribution + notices cannot be construed as modifying the License. You may add Your own + copyright statement to Your modifications and may provide additional or + different license terms and conditions for use, reproduction, or + distribution of Your modifications, or for any such Derivative Works + as a whole, provided Your use, reproduction, and distribution of + the Work otherwise complies with the conditions stated in this License + and your own copyright statement or terms and conditions do not conflict + the conditions stated in the License including section 3. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work @@ -192,7 +192,7 @@ identification within third-party archives. Copyright [yyyy] [name of copyright owner] - Licensed under the Flora License, Version 1.0 (the "License"); + Licensed under the Flora License, Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -203,3 +203,4 @@ identification within third-party archives. 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/NOTICE b/NOTICE index b4d987f..ce3c9fc 100644 --- a/NOTICE +++ b/NOTICE @@ -3,6 +3,6 @@ Except as noted, this software is licensed under Apache License, Version 2. Please, see the LICENSE.APLv2 file for Apache License, Version 2 terms and conditions. Several source codes may have its original copyright owner and/or -be licensed under other than Apache License, Version 2, say, Flora License, Version 1. +be licensed under other than Apache License, Version 2, say, Flora License, Version 1.1 Please, see copyright and license comments section in the header of each file, -and the LICENSE.Flora for Flora License, Version 1 terms and conditions +and the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions diff --git a/inc/FIoSerialPort.h b/inc/FIoSerialPort.h index 646aec7..358a6fd 100644 --- a/inc/FIoSerialPort.h +++ b/inc/FIoSerialPort.h @@ -2,7 +2,7 @@ // Open Service Platform // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora License, Version 1.1 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -- 2.7.4