From c6dd195d9deff7443337abe3ebf04fa7104845e3 Mon Sep 17 00:00:00 2001 From: Park Yong Chul Date: Thu, 2 May 2013 15:50:33 +0900 Subject: [PATCH] Flora license version up [Version]0.0.9.1 [Title] Flora license version up [Problem] N/A [Cause] N/A [Solution] N/A [Team] Profiling [Developer] YongChul Park(yc1216.park) Change-Id: If6e34f57599e849990825b765e7c0d05387b99da Signed-off-by: Park Yong Chul --- LICENSE.Flora | 26 +++++++++++++------------- NOTICE.Flora | 2 +- include/chg_battery.h | 2 +- include/chg_common.h | 2 +- include/chg_drmd.h | 2 +- include/chg_env.h | 2 +- include/chg_fb.h | 2 +- include/chg_fbd.h | 2 +- include/chg_misc.h | 2 +- include/chg_png.h | 2 +- include/chg_power.h | 2 +- packaging/charging-animation.spec | 2 +- src/chg_battery.c | 2 +- src/chg_drmd.c | 2 +- src/chg_env.c | 2 +- src/chg_fb.c | 2 +- src/chg_fbd.c | 2 +- src/chg_main.c | 2 +- src/chg_misc.c | 2 +- src/chg_png.c | 2 +- src/chg_power.c | 2 +- 21 files changed, 33 insertions(+), 33 deletions(-) diff --git a/LICENSE.Flora b/LICENSE.Flora index fd90a36..4a0af40 100755 --- 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.Flora b/NOTICE.Flora index 3997999..42ac28e 100755 --- a/NOTICE.Flora +++ b/NOTICE.Flora @@ -1,4 +1,4 @@ Copyright (c) Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Flora License, Version 1. +Except as noted, this software is licensed under Flora License, Version 1.1 Please, see the LICENSE file for Flora License terms and conditions. diff --git a/include/chg_battery.h b/include/chg_battery.h index 8e134b1..a81ac09 100755 --- a/include/chg_battery.h +++ b/include/chg_battery.h @@ -1,7 +1,7 @@ /* Copyright 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/chg_common.h b/include/chg_common.h index ecbdc18..606a492 100755 --- a/include/chg_common.h +++ b/include/chg_common.h @@ -1,7 +1,7 @@ /* Copyright 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/chg_drmd.h b/include/chg_drmd.h index fd7d4ef..ea6c202 100755 --- a/include/chg_drmd.h +++ b/include/chg_drmd.h @@ -1,7 +1,7 @@ /* Copyright 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/chg_env.h b/include/chg_env.h index 8bb82a7..a8b70a2 100755 --- a/include/chg_env.h +++ b/include/chg_env.h @@ -1,7 +1,7 @@ /* Copyright 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/chg_fb.h b/include/chg_fb.h index 6a5070f..8ab0e79 100755 --- a/include/chg_fb.h +++ b/include/chg_fb.h @@ -1,7 +1,7 @@ /* Copyright 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/chg_fbd.h b/include/chg_fbd.h index 87e106f..aba92b9 100755 --- a/include/chg_fbd.h +++ b/include/chg_fbd.h @@ -1,7 +1,7 @@ /* Copyright 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/chg_misc.h b/include/chg_misc.h index e2f400c..30d44b2 100755 --- a/include/chg_misc.h +++ b/include/chg_misc.h @@ -1,7 +1,7 @@ /* Copyright 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/chg_png.h b/include/chg_png.h index f781a61..6217129 100755 --- a/include/chg_png.h +++ b/include/chg_png.h @@ -1,7 +1,7 @@ /* Copyright 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/chg_power.h b/include/chg_power.h index 25e9a08..b67427b 100755 --- a/include/chg_power.h +++ b/include/chg_power.h @@ -1,7 +1,7 @@ /* Copyright 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/packaging/charging-animation.spec b/packaging/charging-animation.spec index 68b02fe..a9b8807 100755 --- a/packaging/charging-animation.spec +++ b/packaging/charging-animation.spec @@ -2,7 +2,7 @@ Name: charging-animation Summary: charging-animation ExclusiveArch: %{arm} Version: 0.0.9 -Release: 0 +Release: 1 Group: misc License: Flora Software License Source0: %{name}-%{version}.tar.gz diff --git a/src/chg_battery.c b/src/chg_battery.c index b20958a..39afae4 100755 --- a/src/chg_battery.c +++ b/src/chg_battery.c @@ -1,7 +1,7 @@ /* Copyright 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/chg_drmd.c b/src/chg_drmd.c index cf6f0fd..285c84b 100755 --- a/src/chg_drmd.c +++ b/src/chg_drmd.c @@ -1,7 +1,7 @@ /* Copyright 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/chg_env.c b/src/chg_env.c index c018c2b..9bcd129 100755 --- a/src/chg_env.c +++ b/src/chg_env.c @@ -1,7 +1,7 @@ /* Copyright 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/chg_fb.c b/src/chg_fb.c index e3e90d2..7b7c352 100755 --- a/src/chg_fb.c +++ b/src/chg_fb.c @@ -1,7 +1,7 @@ /* Copyright 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/chg_fbd.c b/src/chg_fbd.c index aebcff4..481d318 100755 --- a/src/chg_fbd.c +++ b/src/chg_fbd.c @@ -1,7 +1,7 @@ /* Copyright 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/chg_main.c b/src/chg_main.c index 08ceedf..3f6daac 100755 --- a/src/chg_main.c +++ b/src/chg_main.c @@ -1,7 +1,7 @@ /* Copyright 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/chg_misc.c b/src/chg_misc.c index 501aa69..093bc21 100755 --- a/src/chg_misc.c +++ b/src/chg_misc.c @@ -1,7 +1,7 @@ /* Copyright 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/chg_png.c b/src/chg_png.c index 6850282..972e25e 100755 --- a/src/chg_png.c +++ b/src/chg_png.c @@ -1,7 +1,7 @@ /* Copyright 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/chg_power.c b/src/chg_power.c index 34f91c0..946ff07 100755 --- a/src/chg_power.c +++ b/src/chg_power.c @@ -1,7 +1,7 @@ /* Copyright 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 -- 2.7.4