Change Flora License Version

: 1.0 -> 1.1

Change-Id: Id6ee8cfafb361d9e44414caa2c6012544a6c1518

diff --git a/COPYING.Flora b/COPYING.Flora
index 8310089..8397abc 100644 (file)
--- a/COPYING.Flora
+++ b/COPYING.Flora
@@ -1,7 +1,7 @@
 Copyright notice for Flora-licensed files:
 
 The following files are copyrighted by Samsung Electronics Co., Ltd
-and licensed under Flora License, Version 1.
+and licensed under Flora License, Version 1.1
 - src/bin/e_border.c
 - src/bin/e_main.c
 - src/bin/e_zone.c
@@ -10,7 +10,7 @@ Copyright (C) 2013 Samsung Electronics Co., Ltd All rights reserved.
 
 Flora License
 
-Version 1.0, April, 2013
+Version 1.1, April, 2013
 
 http://floralicense.org/license/
 
@@ -129,17 +129,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

diff --git a/NOTICE b/NOTICE
index 0982205..ffb6455 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -2,5 +2,5 @@ Except as noted, this software is licensed under BSD license.
 Please, see the COPYING file for BSD License terms and conditions.
 
 Several source codes may have its original copyright owner and/or
-be licensed under other than BSD License, say, Flora License, Version 1.
+be licensed under other than BSD License, say, Flora License, Version 1.1
 Please, see the COPYING.Flora for Flora License terms and conditions.

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index c94f0c8..2abc95e 100644 (file)
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * This file is a modified version of BSD licensed file and
- * 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
  *

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 13657e3..bd57930 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * This file is a modified version of BSD licensed file and
- * 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
  *

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 3768f45..8802ae9 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * This file is a modified version of BSD licensed file and
- * 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
  *