From 383c7bcc3e0ef6d49e21dcce8a723bae986ff74c Mon Sep 17 00:00:00 2001 From: Seokpil Park Date: Mon, 29 Apr 2013 18:52:16 +0900 Subject: [PATCH] [appwidget-service] Change Flora license version Change-Id: I290a4a98d918c6da6bb77e4b427072b6935e4cec Signed-off-by: Seokpil Park --- LICENSE.Flora | 26 +++++++++++++------------- NOTICE | 7 +++---- inc/FShell_AppWidgetContext.h | 2 +- inc/FShell_AppWidgetContextBase.h | 2 +- inc/FShell_AppWidgetManagerService.h | 2 +- inc/FShell_AppWidgetManagerStub.h | 2 +- inc/FShell_AppWidgetPopupContext.h | 2 +- inc/OspAppWidgetService.h | 2 +- src/FShell_AppWidgetContext.cpp | 2 +- src/FShell_AppWidgetContextBase.cpp | 2 +- src/FShell_AppWidgetManagerService.cpp | 2 +- src/FShell_AppWidgetManagerStub.cpp | 2 +- src/FShell_AppWidgetPopupContext.cpp | 2 +- src/OspAppWidgetService.cpp | 2 +- src/OspAppWidgetServiceEntry.cpp | 2 +- 15 files changed, 29 insertions(+), 30 deletions(-) mode change 100755 => 100644 LICENSE.Flora diff --git a/LICENSE.Flora b/LICENSE.Flora old mode 100755 new mode 100644 index c7e2bea..571fe79 --- a/LICENSE.Flora +++ b/LICENSE.Flora @@ -1,6 +1,6 @@ Flora License -Version 1.0, May, 2012 +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 --- 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/inc/FShell_AppWidgetContext.h b/inc/FShell_AppWidgetContext.h index c661e17..de41da7 100644 --- a/inc/FShell_AppWidgetContext.h +++ b/inc/FShell_AppWidgetContext.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/FShell_AppWidgetContextBase.h b/inc/FShell_AppWidgetContextBase.h index 949dc6a..d4eac73 100644 --- a/inc/FShell_AppWidgetContextBase.h +++ b/inc/FShell_AppWidgetContextBase.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/FShell_AppWidgetManagerService.h b/inc/FShell_AppWidgetManagerService.h index 64979c5..1a69f51 100644 --- a/inc/FShell_AppWidgetManagerService.h +++ b/inc/FShell_AppWidgetManagerService.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/FShell_AppWidgetManagerStub.h b/inc/FShell_AppWidgetManagerStub.h index 6f2a748..be61005 100644 --- a/inc/FShell_AppWidgetManagerStub.h +++ b/inc/FShell_AppWidgetManagerStub.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/FShell_AppWidgetPopupContext.h b/inc/FShell_AppWidgetPopupContext.h index ab64a2c..7acd207 100644 --- a/inc/FShell_AppWidgetPopupContext.h +++ b/inc/FShell_AppWidgetPopupContext.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/OspAppWidgetService.h b/inc/OspAppWidgetService.h index f1ca1e3..52f6069 100644 --- a/inc/OspAppWidgetService.h +++ b/inc/OspAppWidgetService.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/FShell_AppWidgetContext.cpp b/src/FShell_AppWidgetContext.cpp index ba5b132..fe00529 100644 --- a/src/FShell_AppWidgetContext.cpp +++ b/src/FShell_AppWidgetContext.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/FShell_AppWidgetContextBase.cpp b/src/FShell_AppWidgetContextBase.cpp index 91b41f0..04f46bb 100644 --- a/src/FShell_AppWidgetContextBase.cpp +++ b/src/FShell_AppWidgetContextBase.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/FShell_AppWidgetManagerService.cpp b/src/FShell_AppWidgetManagerService.cpp index 400536c..7886c9e 100644 --- a/src/FShell_AppWidgetManagerService.cpp +++ b/src/FShell_AppWidgetManagerService.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/FShell_AppWidgetManagerStub.cpp b/src/FShell_AppWidgetManagerStub.cpp index 15382c3..35c1b04 100644 --- a/src/FShell_AppWidgetManagerStub.cpp +++ b/src/FShell_AppWidgetManagerStub.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/FShell_AppWidgetPopupContext.cpp b/src/FShell_AppWidgetPopupContext.cpp index 3c47849..3a642c5 100644 --- a/src/FShell_AppWidgetPopupContext.cpp +++ b/src/FShell_AppWidgetPopupContext.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/OspAppWidgetService.cpp b/src/OspAppWidgetService.cpp index 05b0468..2a8b0b2 100644 --- a/src/OspAppWidgetService.cpp +++ b/src/OspAppWidgetService.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/OspAppWidgetServiceEntry.cpp b/src/OspAppWidgetServiceEntry.cpp index 6734f65..a5d3778 100644 --- a/src/OspAppWidgetServiceEntry.cpp +++ b/src/OspAppWidgetServiceEntry.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 // -- 2.34.1