flora license file change

Change-Id: I918998f14a2bfccb3897548096258ed45eb5de78

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 3997999..94d56df 100755 (executable)
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,3 @@
-Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.
-Please, see the LICENSE file for Flora License terms and conditions.
-
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Flora License, Version 1.1
+Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.

diff --git a/include/myaccount_ug.h b/include/myaccount_ug.h
index a002a43..9c1fe72 100755 (executable)
--- a/include/myaccount_ug.h
+++ b/include/myaccount_ug.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the License);\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/myaccount_ug_account_list.h b/include/myaccount_ug_account_list.h
index fb4263c..3a31833 100755 (executable)
--- a/include/myaccount_ug_account_list.h
+++ b/include/myaccount_ug_account_list.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the License);\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/myaccount_ug_addaccount.h b/include/myaccount_ug_addaccount.h
index 48dd0f4..16a9d8c 100755 (executable)
--- a/include/myaccount_ug_addaccount.h
+++ b/include/myaccount_ug_addaccount.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the License);\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/myaccount_ug_common.h b/include/myaccount_ug_common.h
index a785052..e33fd1b 100755 (executable)
--- a/include/myaccount_ug_common.h
+++ b/include/myaccount_ug_common.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the License);\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/myaccount_ug_main.h b/include/myaccount_ug_main.h
index 8d592f9..7e43936 100755 (executable)
--- a/include/myaccount_ug_main.h
+++ b/include/myaccount_ug_main.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the License);\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/myaccount_ug_account_list.c b/src/myaccount_ug_account_list.c
index 06bf8e8..4c01cde 100755 (executable)
--- a/src/myaccount_ug_account_list.c
+++ b/src/myaccount_ug_account_list.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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
  *

diff --git a/src/myaccount_ug_addaccount.c b/src/myaccount_ug_addaccount.c
index 7dfec99..57b903c 100755 (executable)
--- a/src/myaccount_ug_addaccount.c
+++ b/src/myaccount_ug_addaccount.c
@@ -1,22 +1,17 @@
 /*
- *  my-account
+ * Copyright 2012  Samsung Electronics Co., Ltd
  *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>
- *
- * Licensed under the Apache License, Version 2.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
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
- *
  */
 
 #ifndef UG_MODULE_API

diff --git a/src/myaccount_ug_common.c b/src/myaccount_ug_common.c
index e46b205..1a6d85a 100755 (executable)
--- a/src/myaccount_ug_common.c
+++ b/src/myaccount_ug_common.c
@@ -1,22 +1,17 @@
 /*\r
- *  my-account\r
+ * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.\r
- *\r
- * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ * http://floralicense.org/license/\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * distributed under the License is distributed on an AS IS BASIS,\r
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
- *\r
  */\r
 \r
 #include "myaccount_ug.h"\r

diff --git a/src/myaccount_ug_main.c b/src/myaccount_ug_main.c
index a5b4a75..15637f0 100755 (executable)
--- a/src/myaccount_ug_main.c
+++ b/src/myaccount_ug_main.c
@@ -1,22 +1,17 @@
 /*\r
- *  my-account\r
+ * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.\r
- *\r
- * Contact: Wonyoung Lee <wy1115.lee@samsung.com>, Tarun Kumar <tarun.kr@samsung.com>\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ * http://floralicense.org/license/\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * distributed under the License is distributed on an AS IS BASIS,\r
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
- *\r
  */\r
 \r
 #include "myaccount_ug_account_list.h"\r