[Request]Update Flora license version

diff --git a/LICENSE b/LICENSE
index a2ae71e..249b868 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -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 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/NOTICE b/NOTICE
index 62be933..6e010c0 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,2 +1,3 @@
-Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
-
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.\r
+Except as noted, this software is licensed under Flora License, Version 1.1.\r
+Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.\r

diff --git a/clock-common/include/clock_fwk_define.h b/clock-common/include/clock_fwk_define.h
index 6dd5c28..a1ab88d 100644 (file)
--- a/clock-common/include/clock_fwk_define.h
+++ b/clock-common/include/clock_fwk_define.h
@@ -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/clock-common/include/clock_fwk_dlog.h b/clock-common/include/clock_fwk_dlog.h
index 1c8dfec..fc3ca0c 100644 (file)
--- a/clock-common/include/clock_fwk_dlog.h
+++ b/clock-common/include/clock_fwk_dlog.h
@@ -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/clock-common/include/clock_fwk_icu.h b/clock-common/include/clock_fwk_icu.h
index 35ca009..7a813a3 100644 (file)
--- a/clock-common/include/clock_fwk_icu.h
+++ b/clock-common/include/clock_fwk_icu.h
@@ -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/clock-common/include/clock_fwk_util.h b/clock-common/include/clock_fwk_util.h
index 5df77e1..7cc14f3 100644 (file)
--- a/clock-common/include/clock_fwk_util.h
+++ b/clock-common/include/clock_fwk_util.h
@@ -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/clock-common/src/clock_fwk_icu.c b/clock-common/src/clock_fwk_icu.c
index 24168c2..1c48e11 100644 (file)
--- a/clock-common/src/clock_fwk_icu.c
+++ b/clock-common/src/clock_fwk_icu.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/clock-common/src/clock_fwk_util.c b/clock-common/src/clock_fwk_util.c
index 160af76..2bb7954 100644 (file)
--- a/clock-common/src/clock_fwk_util.c
+++ b/clock-common/src/clock_fwk_util.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/include/clock_fwk_icu_label.h b/include/clock_fwk_icu_label.h
index 4dc2435..7aa1ab3 100644 (file)
--- a/include/clock_fwk_icu_label.h
+++ b/include/clock_fwk_icu_label.h
@@ -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/include/ug_worldclock_efl.h b/include/ug_worldclock_efl.h
index a32ef82..bca6f74 100644 (file)
--- a/include/ug_worldclock_efl.h
+++ b/include/ug_worldclock_efl.h
@@ -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/include/worldclock.h b/include/worldclock.h
index e01e332..4670ae2 100644 (file)
--- a/include/worldclock.h
+++ b/include/worldclock.h
@@ -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/include/worldclock_add_view.h b/include/worldclock_add_view.h
index 700447b..bdb3291 100644 (file)
--- a/include/worldclock_add_view.h
+++ b/include/worldclock_add_view.h
@@ -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/include/worldclock_const.h b/include/worldclock_const.h
index e1e699c..4446112 100644 (file)
--- a/include/worldclock_const.h
+++ b/include/worldclock_const.h
@@ -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/include/worldclock_data.h b/include/worldclock_data.h
index b3c817a..f4d81c4 100644 (file)
--- a/include/worldclock_data.h
+++ b/include/worldclock_data.h
@@ -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/include/worldclock_dlog.h b/include/worldclock_dlog.h
index 3036a72..a259ec4 100644 (file)
--- a/include/worldclock_dlog.h
+++ b/include/worldclock_dlog.h
@@ -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/include/worldclock_fwk_icu.h b/include/worldclock_fwk_icu.h
index 879ab12..2d719a9 100644 (file)
--- a/include/worldclock_fwk_icu.h
+++ b/include/worldclock_fwk_icu.h
@@ -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/include/worldclock_timezone.h b/include/worldclock_timezone.h
index 8f21cc0..8bdd21e 100644 (file)
--- a/include/worldclock_timezone.h
+++ b/include/worldclock_timezone.h
@@ -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/include/worldclock_types.h b/include/worldclock_types.h
index cf14470..93a1e91 100644 (file)
--- a/include/worldclock_types.h
+++ b/include/worldclock_types.h
@@ -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/include/worldclock_util.h b/include/worldclock_util.h
index f3addff..8afbd31 100644 (file)
--- a/include/worldclock_util.h
+++ b/include/worldclock_util.h
@@ -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/res/edc/worldclock.edc b/res/edc/worldclock.edc
index 40814a0..1cae0a6 100644 (file)
--- a/res/edc/worldclock.edc
+++ b/res/edc/worldclock.edc
@@ -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/res/edc/worldclock_add.edc b/res/edc/worldclock_add.edc
index c192c7b..029e7cb 100644 (file)
--- a/res/edc/worldclock_add.edc
+++ b/res/edc/worldclock_add.edc
@@ -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/res/edc/worldclock_segment.edc b/res/edc/worldclock_segment.edc
index fb185ab..f98e27a 100644 (file)
--- a/res/edc/worldclock_segment.edc
+++ b/res/edc/worldclock_segment.edc
@@ -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/res/theme/worldclock_macro.edc b/res/theme/worldclock_macro.edc
index 7614ada..f0d31f1 100644 (file)
--- a/res/theme/worldclock_macro.edc
+++ b/res/theme/worldclock_macro.edc
@@ -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/res/theme/worldclock_theme.edc b/res/theme/worldclock_theme.edc
index 3ac12bf..bed6205 100644 (file)
--- a/res/theme/worldclock_theme.edc
+++ b/res/theme/worldclock_theme.edc
@@ -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/clock_fwk_icu_label.cpp b/src/clock_fwk_icu_label.cpp
index f392799..5f47368 100644 (file)
--- a/src/clock_fwk_icu_label.cpp
+++ b/src/clock_fwk_icu_label.cpp
@@ -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/ug_worldclock_efl.c b/src/ug_worldclock_efl.c
index 5fc69f3..85fcf89 100644 (file)
--- a/src/ug_worldclock_efl.c
+++ b/src/ug_worldclock_efl.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/worldclock_add_view.c b/src/worldclock_add_view.c
index 2dd503f..9580342 100644 (file)
--- a/src/worldclock_add_view.c
+++ b/src/worldclock_add_view.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/worldclock_data.c b/src/worldclock_data.c
index 9887822..8c1f751 100644 (file)
--- a/src/worldclock_data.c
+++ b/src/worldclock_data.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/worldclock_fwk_icu.c b/src/worldclock_fwk_icu.c
index b924892..8227836 100644 (file)
--- a/src/worldclock_fwk_icu.c
+++ b/src/worldclock_fwk_icu.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/worldclock_util.c b/src/worldclock_util.c
index 31416e3..d7fc6eb 100644 (file)
--- a/src/worldclock_util.c
+++ b/src/worldclock_util.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
  *