From d41099decc6c4fafd3f0499538274876f4945ea2 Mon Sep 17 00:00:00 2001 From: Junghyun Kim Date: Thu, 2 May 2013 10:10:20 +0900 Subject: Flora license update --- LICENSE.Flora | 26 +++++++++++++------------- NOTICE | 2 +- data/groups/search_custom_ctxpopup_item.edc | 3 ++- data/groups/search_custom_style.edc | 3 ++- data/groups/search_result.edc | 3 ++- data/smartsearch-color.edc | 9 +++++---- data/smartsearch.edc | 3 ++- include/common_util.h | 3 ++- include/ps_app_interface.h | 3 ++- include/ps_debug_util.h | 3 ++- include/ps_makeupviews.h | 3 ++- include/ps_searcher.h | 3 ++- include/search_bar.h | 3 ++- include/smartsearch.h | 3 ++- include/smartsearch_define.h | 3 ++- src/common_util.cpp | 3 ++- src/ps_app_interface.cpp | 3 ++- src/ps_makeupviews.cpp | 3 ++- src/ps_searcher.cpp | 3 ++- src/search_bar.cpp | 3 ++- src/smartsearch.cpp | 3 ++- 21 files changed, 55 insertions(+), 36 deletions(-) diff --git a/LICENSE.Flora b/LICENSE.Flora index fd90a36..571fe79 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 b/NOTICE index ffacf89..4a608b0 100755 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ 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/data/groups/search_custom_ctxpopup_item.edc b/data/groups/search_custom_ctxpopup_item.edc index c9c0e3e..ebf1724 100755 --- a/data/groups/search_custom_ctxpopup_item.edc +++ b/data/groups/search_custom_ctxpopup_item.edc @@ -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 * @@ -14,6 +14,7 @@ * limitations under the License. */ + /////////////////////////////////////////////////////////////////////////////////////// // // ctxpopup diff --git a/data/groups/search_custom_style.edc b/data/groups/search_custom_style.edc index e4a78dc..549570c 100755 --- a/data/groups/search_custom_style.edc +++ b/data/groups/search_custom_style.edc @@ -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 * @@ -14,6 +14,7 @@ * limitations under the License. */ + group { name: "smartsearch/custom_image_button"; parts { diff --git a/data/groups/search_result.edc b/data/groups/search_result.edc index 6f311a6..f398d29 100755 --- a/data/groups/search_result.edc +++ b/data/groups/search_result.edc @@ -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 * @@ -17,6 +17,7 @@ + group { name: "smartsearch/search_result"; parts { diff --git a/data/smartsearch-color.edc b/data/smartsearch-color.edc index 4deb85d..a6fa558 100755 --- a/data/smartsearch-color.edc +++ b/data/smartsearch-color.edc @@ -1,18 +1,19 @@ /* * 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 - * + * * http://floralicense.org/license/ - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ + #define SEARCHBAR_BACKGROUND_COLOR_DEFAULT 248 246 239 255 #define SEARCHBAR_BACKGROUND_COLOR_BLACK 36 36 36 255 #define SEARCHBAR_BACKGROUND_COLOR_BLUE 17 23 27 255 diff --git a/data/smartsearch.edc b/data/smartsearch.edc index 8d6a09f..23ffa8e 100755 --- a/data/smartsearch.edc +++ b/data/smartsearch.edc @@ -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 * @@ -17,6 +17,7 @@ + collections { #include "smartsearch-color.edc" #include "groups/search_result.edc" diff --git a/include/common_util.h b/include/common_util.h index 4d9f5cc..a05b17c 100755 --- a/include/common_util.h +++ b/include/common_util.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 * @@ -17,6 +17,7 @@ + #define CHECK_VALIDATE_UTF8 0 void search_util_date_time_format_init(); diff --git a/include/ps_app_interface.h b/include/ps_app_interface.h index ecb55ad..b81a81d 100755 --- a/include/ps_app_interface.h +++ b/include/ps_app_interface.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 * @@ -19,6 +19,7 @@ + #ifndef __DEF_PS_APP_INTERFACE_H__ #define __DEF_PS_APP_INTERFACE_H__ diff --git a/include/ps_debug_util.h b/include/ps_debug_util.h index bf4f212..9fd0e3d 100755 --- a/include/ps_debug_util.h +++ b/include/ps_debug_util.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 * @@ -19,6 +19,7 @@ + #ifndef __DEF_PS_DEBUG_UTIL_H__ #define __DEF_PS_DEBUG_UTIL_H__ diff --git a/include/ps_makeupviews.h b/include/ps_makeupviews.h index d64e0c6..1a9711d 100755 --- a/include/ps_makeupviews.h +++ b/include/ps_makeupviews.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 * @@ -19,6 +19,7 @@ + #ifndef __DEF_PS_MAKEUPVIEWS_H__ #define __DEF_PS_MAKEUPVIEWS_H__ diff --git a/include/ps_searcher.h b/include/ps_searcher.h index 0749dad..0bc21a1 100755 --- a/include/ps_searcher.h +++ b/include/ps_searcher.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 * @@ -15,6 +15,7 @@ */ + #ifndef __SEARCHSEARCHER_HEADER_H__ #define __SEARCHSEARCHER_HEADER_H__ diff --git a/include/search_bar.h b/include/search_bar.h index e9be2b9..3283706 100755 --- a/include/search_bar.h +++ b/include/search_bar.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 * @@ -19,6 +19,7 @@ + #ifndef __DEF_SEARCH_BAR_H__ #define __DEF_SEARCH_BAR_H__ diff --git a/include/smartsearch.h b/include/smartsearch.h index 0726a6f..c003ccf 100755 --- a/include/smartsearch.h +++ b/include/smartsearch.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 * @@ -19,6 +19,7 @@ + #ifndef __DEF_SMARTSEARCH_H__ #define __DEF_SMARTSEARCH_H__ diff --git a/include/smartsearch_define.h b/include/smartsearch_define.h index 0894c6f..a180a2c 100755 --- a/include/smartsearch_define.h +++ b/include/smartsearch_define.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 * @@ -15,6 +15,7 @@ */ + #ifndef __DEF_SMARTSEARCH_DEFINE_H__ #define __DEF_SMARTSEARCH_DEFINE_H__ diff --git a/src/common_util.cpp b/src/common_util.cpp index 101b732..3a7c30f 100755 --- a/src/common_util.cpp +++ b/src/common_util.cpp @@ -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 * @@ -19,6 +19,7 @@ + #include #include #include diff --git a/src/ps_app_interface.cpp b/src/ps_app_interface.cpp index dbecb51..0aa34b2 100755 --- a/src/ps_app_interface.cpp +++ b/src/ps_app_interface.cpp @@ -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 * @@ -19,6 +19,7 @@ + #include "smartsearch.h" #include "ps_app_interface.h" #include "ps_searcher.h" diff --git a/src/ps_makeupviews.cpp b/src/ps_makeupviews.cpp index b3888e9..6bcbc64 100755 --- a/src/ps_makeupviews.cpp +++ b/src/ps_makeupviews.cpp @@ -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 * @@ -15,6 +15,7 @@ */ + #include "smartsearch.h" #include "ps_searcher.h" #include "ps_app_interface.h" diff --git a/src/ps_searcher.cpp b/src/ps_searcher.cpp index ed43f30..787e22e 100755 --- a/src/ps_searcher.cpp +++ b/src/ps_searcher.cpp @@ -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 * @@ -19,6 +19,7 @@ + #include "smartsearch.h" #include diff --git a/src/search_bar.cpp b/src/search_bar.cpp index a56ed2a..afab825 100755 --- a/src/search_bar.cpp +++ b/src/search_bar.cpp @@ -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 * @@ -19,6 +19,7 @@ + #include #include "smartsearch.h" #include "Elementary.h" diff --git a/src/smartsearch.cpp b/src/smartsearch.cpp index a372238..dbd6cea 100755 --- a/src/smartsearch.cpp +++ b/src/smartsearch.cpp @@ -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 * @@ -19,6 +19,7 @@ + #include #include #include -- cgit v1.2.3