Update License

Change-Id: Iff2389f4d9cb9663c34925933defadd76487acf1

diff --git a/LICENSE b/LICENSE.Flora
old mode 100644 (file)
new mode 100755 (executable)
similarity index 91%
rename from LICENSE
rename to LICENSE.Flora
index fd90a36..571fe79
--- a/LICENSE
+++ 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/data/Inc.sat-ui.normal.edc b/data/Inc.sat-ui.normal.edc
index 29a3c52..bd30e9f 100644 (file)
--- a/data/Inc.sat-ui.normal.edc
+++ b/data/Inc.sat-ui.normal.edc
@@ -1,7 +1,7 @@
 /*
  * 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/data/Inc.sat-ui.text.edc b/data/Inc.sat-ui.text.edc
index 9315946..28201c4 100644 (file)
--- a/data/Inc.sat-ui.text.edc
+++ b/data/Inc.sat-ui.text.edc
@@ -1,7 +1,7 @@
 /*
  * 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/data/sat-ui.edc b/data/sat-ui.edc
index f544816..bc5223a 100644 (file)
--- a/data/sat-ui.edc
+++ b/data/sat-ui.edc
@@ -1,7 +1,7 @@
 /*
  * 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/include/common_string.h b/include/common_string.h
index 0d6a030..88273c6 100644 (file)
--- a/include/common_string.h
+++ b/include/common_string.h
@@ -1,7 +1,7 @@
 /*
  * 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/include/display-text-view.h b/include/display-text-view.h
index 0cfb298..1d03562 100644 (file)
--- a/include/display-text-view.h
+++ b/include/display-text-view.h
@@ -1,7 +1,7 @@
 /*
  * 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/include/get-inkey-view.h b/include/get-inkey-view.h
index f8aa3cf..b551baf 100644 (file)
--- a/include/get-inkey-view.h
+++ b/include/get-inkey-view.h
@@ -1,7 +1,7 @@
 /*
  * 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/include/get-input-view.h b/include/get-input-view.h
index cb9e444..99e805a 100644 (file)
--- a/include/get-input-view.h
+++ b/include/get-input-view.h
@@ -1,7 +1,7 @@
 /*
  * 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/include/sat-ui-debug.h b/include/sat-ui-debug.h
index db90c65..4b77d32 100644 (file)
--- a/include/sat-ui-debug.h
+++ b/include/sat-ui-debug.h
@@ -1,7 +1,7 @@
 /*
  * 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/include/sat-ui-icon.h b/include/sat-ui-icon.h
index dfb90fd..e5dea73 100644 (file)
--- a/include/sat-ui-icon.h
+++ b/include/sat-ui-icon.h
@@ -1,7 +1,7 @@
 /*
  * 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/include/sat-ui.h b/include/sat-ui.h
index 9233829..4d15790 100755 (executable)
--- a/include/sat-ui.h
+++ b/include/sat-ui.h
@@ -1,7 +1,7 @@
 /*
  * 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/include/select-item-view.h b/include/select-item-view.h
index 0799b17..04409eb 100644 (file)
--- a/include/select-item-view.h
+++ b/include/select-item-view.h
@@ -1,7 +1,7 @@
 /*
  * 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/include/setup-menu-view.h b/include/setup-menu-view.h
index a7b2c22..924e008 100644 (file)
--- a/include/setup-menu-view.h
+++ b/include/setup-menu-view.h
@@ -1,7 +1,7 @@
 /*
  * 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/include/tel-request.h b/include/tel-request.h
index d34e046..7a67f5c 100644 (file)
--- a/include/tel-request.h
+++ b/include/tel-request.h
@@ -1,7 +1,7 @@
 /*
  * 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/include/winset.h b/include/winset.h
index 0bb26ab..fdad992 100644 (file)
--- a/include/winset.h
+++ b/include/winset.h
@@ -1,7 +1,7 @@
 /*
  * 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/sat-event-downloader/event-list.c b/sat-event-downloader/event-list.c
index 5ba4a19..6f4054f 100755 (executable)
--- a/sat-event-downloader/event-list.c
+++ b/sat-event-downloader/event-list.c
@@ -1,7 +1,7 @@
 /*
  * 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/sat-event-downloader/event-list.h b/sat-event-downloader/event-list.h
index 40e1984..42c79f9 100644 (file)
--- a/sat-event-downloader/event-list.h
+++ b/sat-event-downloader/event-list.h
@@ -1,7 +1,7 @@
 /*
  * 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/sat-event-downloader/main.c b/sat-event-downloader/main.c
index eaad47d..ef00236 100755 (executable)
--- a/sat-event-downloader/main.c
+++ b/sat-event-downloader/main.c
@@ -1,7 +1,7 @@
 /*
  * 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/sat-event-downloader/utils.h b/sat-event-downloader/utils.h
index b47e4d5..017a87e 100755 (executable)
--- a/sat-event-downloader/utils.h
+++ b/sat-event-downloader/utils.h
@@ -1,7 +1,7 @@
 /*
  * 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/display-text-view.c b/src/display-text-view.c
index 84b1fdf..b4e3728 100755 (executable)
--- a/src/display-text-view.c
+++ b/src/display-text-view.c
@@ -1,7 +1,7 @@
 /*
  * 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/get-inkey-view.c b/src/get-inkey-view.c
index 8124254..7bcbaa2 100755 (executable)
--- a/src/get-inkey-view.c
+++ b/src/get-inkey-view.c
@@ -1,7 +1,7 @@
 /*
  * 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/get-input-view.c b/src/get-input-view.c
index ce56775..5095b3f 100755 (executable)
--- a/src/get-input-view.c
+++ b/src/get-input-view.c
@@ -1,7 +1,7 @@
 /*
  * 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/sat-ui-icon.c b/src/sat-ui-icon.c
index 0f6b216..b676fbc 100755 (executable)
--- a/src/sat-ui-icon.c
+++ b/src/sat-ui-icon.c
@@ -1,7 +1,7 @@
 /*
  * 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/sat-ui.c b/src/sat-ui.c
index 1ea5d43..dc89214 100755 (executable)
--- a/src/sat-ui.c
+++ b/src/sat-ui.c
@@ -1,7 +1,7 @@
 /*
  * 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/select-item-view.c b/src/select-item-view.c
index a1a6c57..e0035c2 100755 (executable)
--- a/src/select-item-view.c
+++ b/src/select-item-view.c
@@ -1,7 +1,7 @@
 /*
  * 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/setup-menu-view.c b/src/setup-menu-view.c
index d2aa9b0..f4afb78 100755 (executable)
--- a/src/setup-menu-view.c
+++ b/src/setup-menu-view.c
@@ -1,7 +1,7 @@
 /*
  * 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/tel-request.c b/src/tel-request.c
index 58f7e28..a24ba41 100755 (executable)
--- a/src/tel-request.c
+++ b/src/tel-request.c
@@ -1,7 +1,7 @@
 /*
  * 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/winset.c b/src/winset.c
index a51b444..c7d5087 100755 (executable)
--- a/src/winset.c
+++ b/src/winset.c
@@ -1,7 +1,7 @@
 /*
  * 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
  *