Update Flora License

Change-Id: Iadbdefaf04b44e3dd75afde38885b6e77b2adaa0
Signed-off-by: Jaehwan Lee <jh8379.lee@samsung.com>

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36..571fe79 100755 (executable)
--- 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
 

diff --git a/NOTICE b/NOTICE
index 158c7a0..a2e6248 100755 (executable)
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,8 @@
-Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
 Except as noted, this software is licensed under Apache License, Version 2.
-Please, see the LICENSE file for Apache License terms and conditions.
+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 terms and conditions.
\ No newline at end of file
+and the LICENSE.Flora for Flora License, Version 1.1 terms and conditions.
\ No newline at end of file

diff --git a/inc/NfcMessagePushDelegate.h b/inc/NfcMessagePushDelegate.h
index baeabf7..bf1ed2c 100644 (file)
--- a/inc/NfcMessagePushDelegate.h
+++ b/inc/NfcMessagePushDelegate.h
@@ -2,7 +2,7 @@
 // Open Service Platform
 // Copyright (c) 2012-2013 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
 //

diff --git a/inc/NfcMessageRegisterService.h b/inc/NfcMessageRegisterService.h
index 079db62..7b210bc 100644 (file)
--- a/inc/NfcMessageRegisterService.h
+++ b/inc/NfcMessageRegisterService.h
@@ -2,7 +2,7 @@
 // Open Service Platform
 // Copyright (c) 2012-2013 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
 //

diff --git a/inc/NfcService.h b/inc/NfcService.h
index ce5d0a9..f1183da 100644 (file)
--- a/inc/NfcService.h
+++ b/inc/NfcService.h
@@ -2,7 +2,7 @@
 // Open Service Platform
 // Copyright (c) 2012-2013 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
 //

diff --git a/src/NfcMessagePushDelegate.cpp b/src/NfcMessagePushDelegate.cpp
index 2c6709f..977ab1b 100644 (file)
--- a/src/NfcMessagePushDelegate.cpp
+++ b/src/NfcMessagePushDelegate.cpp
@@ -2,7 +2,7 @@
 // Open Service Platform
 // Copyright (c) 2012-2013 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
 //

diff --git a/src/NfcMessageRegisterService.cpp b/src/NfcMessageRegisterService.cpp
index 33351e8..08b5d86 100644 (file)
--- a/src/NfcMessageRegisterService.cpp
+++ b/src/NfcMessageRegisterService.cpp
@@ -2,7 +2,7 @@
 // Open Service Platform
 // Copyright (c) 2012-2013 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
 //

diff --git a/src/NfcService.cpp b/src/NfcService.cpp
index 8a743a4..e02a6f8 100644 (file)
--- a/src/NfcService.cpp
+++ b/src/NfcService.cpp
@@ -2,7 +2,7 @@
 // Open Service Platform
 // Copyright (c) 2012-2013 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
 //