From 147ce02d60a9a2052887c985afeee6cdd1a5501c Mon Sep 17 00:00:00 2001 From: "gliang.wang" Date: Thu, 2 May 2013 09:39:28 +0800 Subject: [PATCH] [SR][Request] Update the Flora license Change-Id: I368a31d4556c7fc916f7d1fe51b8d0dbc654ade1 --- LICENSE.Flora | 4 ++-- NOTICE.Flora | 4 ++-- packaging/ug-myfile-efl.spec | 2 +- src/common/file-system/mf-ug-file-attr.c | 2 +- src/common/file-system/mf-ug-fs-oper.c | 2 +- src/common/mf-ug-cb.c | 2 +- src/common/mf-ug-fm-svc-wapper.c | 2 +- src/common/mf-ug-inotify-handle.c | 2 +- src/common/mf-ug-list-play.c | 2 +- src/common/mf-ug-search-internal.c | 2 +- src/common/mf-ug-search.c | 2 +- src/common/mf-ug-util.c | 2 +- src/include/mf-ug-cb.h | 2 +- src/include/mf-ug-conf.h | 2 +- src/include/mf-ug-dlog.h | 2 +- src/include/mf-ug-fm-svc-wrapper.h | 2 +- src/include/mf-ug-fs-util.h | 2 +- src/include/mf-ug-inotify-handle.h | 2 +- src/include/mf-ug-list-play.h | 2 +- src/include/mf-ug-main.h | 2 +- src/include/mf-ug-resource.h | 2 +- src/include/mf-ug-search-internal.h | 2 +- src/include/mf-ug-search.h | 2 +- src/include/mf-ug-util.h | 2 +- src/include/mf-ug-winset.h | 2 +- src/mf-ug-main.c | 2 +- src/widget/mf-ug-ctrl-bar.c | 2 +- src/widget/mf-ug-genlist.c | 2 +- src/widget/mf-ug-navi-bar.c | 2 +- src/widget/mf-ug-popup.c | 2 +- src/widget/mf-ug-search-view.c | 2 +- src/widget/mf-ug-tab-bar.c | 2 +- 32 files changed, 34 insertions(+), 34 deletions(-) diff --git a/LICENSE.Flora b/LICENSE.Flora index c7e2bea..ee51c0c 100644 --- a/LICENSE.Flora +++ b/LICENSE.Flora @@ -1,6 +1,6 @@ Flora License -Version 1.0, May, 2012 +Version 1.1, May, 2012 http://floralicense.org/license/ @@ -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..73f7581 100644 --- 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. -Please, see the LICENSE file for Flora License terms and conditions. +Except as noted, this software is licensed under Flora License, Version 1.1 +Please, see the LICENSE file for Flora License, Version 1.1 terms and conditions. diff --git a/packaging/ug-myfile-efl.spec b/packaging/ug-myfile-efl.spec index 95c2bbc..01a4461 100644 --- a/packaging/ug-myfile-efl.spec +++ b/packaging/ug-myfile-efl.spec @@ -1,7 +1,7 @@ #sbs-git:slp/pkgs/u/ug-myfile-efl ug-myfile-efl 0.0.1 1b44640a2e59d1af1ab0792e39a73bf3680b25c9 Name: ug-myfile-efl Summary: Myfile UI Gadget (EFL) -Version: 0.0.47 +Version: 0.0.48 Release: 1 Group: misc License: Flora diff --git a/src/common/file-system/mf-ug-file-attr.c b/src/common/file-system/mf-ug-file-attr.c index 78f8b5f..80c2b3e 100644 --- a/src/common/file-system/mf-ug-file-attr.c +++ b/src/common/file-system/mf-ug-file-attr.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/common/file-system/mf-ug-fs-oper.c b/src/common/file-system/mf-ug-fs-oper.c index eb539f2..8646ec0 100644 --- a/src/common/file-system/mf-ug-fs-oper.c +++ b/src/common/file-system/mf-ug-fs-oper.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/common/mf-ug-cb.c b/src/common/mf-ug-cb.c index 1708709..ad6e8fd 100644 --- a/src/common/mf-ug-cb.c +++ b/src/common/mf-ug-cb.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/common/mf-ug-fm-svc-wapper.c b/src/common/mf-ug-fm-svc-wapper.c index e7f7509..94525db 100644 --- a/src/common/mf-ug-fm-svc-wapper.c +++ b/src/common/mf-ug-fm-svc-wapper.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/common/mf-ug-inotify-handle.c b/src/common/mf-ug-inotify-handle.c index 2fa4e18..d75c23a 100644 --- a/src/common/mf-ug-inotify-handle.c +++ b/src/common/mf-ug-inotify-handle.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/common/mf-ug-list-play.c b/src/common/mf-ug-list-play.c index 5fd9e1b..5e8fe7d 100644 --- a/src/common/mf-ug-list-play.c +++ b/src/common/mf-ug-list-play.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/common/mf-ug-search-internal.c b/src/common/mf-ug-search-internal.c index 55e6029..052fe11 100644 --- a/src/common/mf-ug-search-internal.c +++ b/src/common/mf-ug-search-internal.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/common/mf-ug-search.c b/src/common/mf-ug-search.c index 31be24d..68d8e1d 100644 --- a/src/common/mf-ug-search.c +++ b/src/common/mf-ug-search.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/common/mf-ug-util.c b/src/common/mf-ug-util.c index 6d9c581..1c6eaed 100644 --- a/src/common/mf-ug-util.c +++ b/src/common/mf-ug-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/src/include/mf-ug-cb.h b/src/include/mf-ug-cb.h index 13f0f8d..f9fa293 100644 --- a/src/include/mf-ug-cb.h +++ b/src/include/mf-ug-cb.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/src/include/mf-ug-conf.h b/src/include/mf-ug-conf.h index 57df023..103111e 100644 --- a/src/include/mf-ug-conf.h +++ b/src/include/mf-ug-conf.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/src/include/mf-ug-dlog.h b/src/include/mf-ug-dlog.h index 1401063..da73258 100644 --- a/src/include/mf-ug-dlog.h +++ b/src/include/mf-ug-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/src/include/mf-ug-fm-svc-wrapper.h b/src/include/mf-ug-fm-svc-wrapper.h index 4738fd6..d375242 100644 --- a/src/include/mf-ug-fm-svc-wrapper.h +++ b/src/include/mf-ug-fm-svc-wrapper.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/src/include/mf-ug-fs-util.h b/src/include/mf-ug-fs-util.h index 680fde4..8f34b5d 100644 --- a/src/include/mf-ug-fs-util.h +++ b/src/include/mf-ug-fs-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/src/include/mf-ug-inotify-handle.h b/src/include/mf-ug-inotify-handle.h index 1977e8b..347e9b2 100644 --- a/src/include/mf-ug-inotify-handle.h +++ b/src/include/mf-ug-inotify-handle.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/src/include/mf-ug-list-play.h b/src/include/mf-ug-list-play.h index b24f39b..6ff1f6e 100644 --- a/src/include/mf-ug-list-play.h +++ b/src/include/mf-ug-list-play.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/src/include/mf-ug-main.h b/src/include/mf-ug-main.h index a0ccb2d..45d69d6 100644 --- a/src/include/mf-ug-main.h +++ b/src/include/mf-ug-main.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/src/include/mf-ug-resource.h b/src/include/mf-ug-resource.h index fbaccee..9cc83d2 100644 --- a/src/include/mf-ug-resource.h +++ b/src/include/mf-ug-resource.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/src/include/mf-ug-search-internal.h b/src/include/mf-ug-search-internal.h index c95ff58..92b51e0 100644 --- a/src/include/mf-ug-search-internal.h +++ b/src/include/mf-ug-search-internal.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/src/include/mf-ug-search.h b/src/include/mf-ug-search.h index 88064c7..2c4fcee 100644 --- a/src/include/mf-ug-search.h +++ b/src/include/mf-ug-search.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/src/include/mf-ug-util.h b/src/include/mf-ug-util.h index e3ceea6..bffae33 100644 --- a/src/include/mf-ug-util.h +++ b/src/include/mf-ug-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/src/include/mf-ug-winset.h b/src/include/mf-ug-winset.h index 36530e2..abcf83e 100644 --- a/src/include/mf-ug-winset.h +++ b/src/include/mf-ug-winset.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/src/mf-ug-main.c b/src/mf-ug-main.c index 591e29e..4225231 100644 --- a/src/mf-ug-main.c +++ b/src/mf-ug-main.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/widget/mf-ug-ctrl-bar.c b/src/widget/mf-ug-ctrl-bar.c index e538019..6616594 100644 --- a/src/widget/mf-ug-ctrl-bar.c +++ b/src/widget/mf-ug-ctrl-bar.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/widget/mf-ug-genlist.c b/src/widget/mf-ug-genlist.c index ffc2482..40786bf 100644 --- a/src/widget/mf-ug-genlist.c +++ b/src/widget/mf-ug-genlist.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/widget/mf-ug-navi-bar.c b/src/widget/mf-ug-navi-bar.c index b552718..478eec2 100644 --- a/src/widget/mf-ug-navi-bar.c +++ b/src/widget/mf-ug-navi-bar.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/widget/mf-ug-popup.c b/src/widget/mf-ug-popup.c index 438d651..15755d2 100644 --- a/src/widget/mf-ug-popup.c +++ b/src/widget/mf-ug-popup.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/widget/mf-ug-search-view.c b/src/widget/mf-ug-search-view.c index 698237e..a09e44b 100644 --- a/src/widget/mf-ug-search-view.c +++ b/src/widget/mf-ug-search-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/widget/mf-ug-tab-bar.c b/src/widget/mf-ug-tab-bar.c index fe4d4b5..427575e 100644 --- a/src/widget/mf-ug-tab-bar.c +++ b/src/widget/mf-ug-tab-bar.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 * -- 2.7.4