From 6f4e661192f57cde2a5302f9b74193328e1f8a10 Mon Sep 17 00:00:00 2001 From: "hhh.kwon" Date: Thu, 2 May 2013 13:40:19 +0900 Subject: Update license version. --- LICENSE.Flora | 26 +++++++++++----------- NOTICE | 4 ++-- include/hw_key.h | 2 +- include/lock-daemon.h | 2 +- include/lockd-debug.h | 2 +- include/lockd-process-mgr.h | 2 +- include/lockd-window-mgr.h | 2 +- include/menu_daemon.h | 2 +- include/pkg_event.h | 2 +- include/starter-util.h | 2 +- include/starter-vconf.h | 2 +- include/starter.h | 2 +- include/util.h | 2 +- include/x11.h | 2 +- include/xmonitor.h | 2 +- .../include/lockscreen-options-debug.h | 2 +- .../include/lockscreen-options-main.h | 2 +- .../include/lockscreen-options-util.h | 2 +- .../include/lockscreen-options.h | 2 +- .../src/lockscreen-options-main.c | 2 +- .../src/lockscreen-options-util.c | 2 +- .../lockscreen-options/src/lockscreen-options.c | 2 +- src/hw_key.c | 2 +- src/lock-daemon.c | 2 +- src/lockd-debug.c | 2 +- src/lockd-process-mgr.c | 2 +- src/lockd-window-mgr.c | 2 +- src/menu_daemon.c | 2 +- src/pkg_event.c | 2 +- src/starter.c | 2 +- src/x11.c | 2 +- src/xmonitor.c | 2 +- test/get_entry.c | 2 +- test/get_theme.c | 2 +- test/set_theme.c | 2 +- 35 files changed, 48 insertions(+), 48 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 5fa11d2..db64ab0 100755 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,3 @@ Copyright (c) 2012 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/include/hw_key.h b/include/hw_key.h index ffde950..42d891d 100755 --- a/include/hw_key.h +++ b/include/hw_key.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/lock-daemon.h b/include/lock-daemon.h index d618c79..268d945 100755 --- a/include/lock-daemon.h +++ b/include/lock-daemon.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/lockd-debug.h b/include/lockd-debug.h index ab37aee..07a3835 100755 --- a/include/lockd-debug.h +++ b/include/lockd-debug.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/lockd-process-mgr.h b/include/lockd-process-mgr.h index f75756a..195f73f 100755 --- a/include/lockd-process-mgr.h +++ b/include/lockd-process-mgr.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/lockd-window-mgr.h b/include/lockd-window-mgr.h index 33ddf0f..d30ab31 100755 --- a/include/lockd-window-mgr.h +++ b/include/lockd-window-mgr.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/menu_daemon.h b/include/menu_daemon.h index 994ff82..de3e843 100755 --- a/include/menu_daemon.h +++ b/include/menu_daemon.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/pkg_event.h b/include/pkg_event.h index 0574282..a9fb2cd 100755 --- a/include/pkg_event.h +++ b/include/pkg_event.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/starter-util.h b/include/starter-util.h index 1dc131d..117c9a4 100755 --- a/include/starter-util.h +++ b/include/starter-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/include/starter-vconf.h b/include/starter-vconf.h index 400a3d9..f75bb77 100755 --- a/include/starter-vconf.h +++ b/include/starter-vconf.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/starter.h b/include/starter.h index fd187b6..00ee1e6 100755 --- a/include/starter.h +++ b/include/starter.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/util.h b/include/util.h index 63262ac..b59d2dc 100755 --- a/include/util.h +++ b/include/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/include/x11.h b/include/x11.h index fc047e5..bad90a4 100755 --- a/include/x11.h +++ b/include/x11.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/xmonitor.h b/include/xmonitor.h index 85ae907..097e613 100755 --- a/include/xmonitor.h +++ b/include/xmonitor.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/lock-setting/lockscreen-options/include/lockscreen-options-debug.h b/lock-setting/lockscreen-options/include/lockscreen-options-debug.h index 2e2f966..ef9799b 100755 --- a/lock-setting/lockscreen-options/include/lockscreen-options-debug.h +++ b/lock-setting/lockscreen-options/include/lockscreen-options-debug.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/lock-setting/lockscreen-options/include/lockscreen-options-main.h b/lock-setting/lockscreen-options/include/lockscreen-options-main.h index 89fb9bb..d4c05ec 100755 --- a/lock-setting/lockscreen-options/include/lockscreen-options-main.h +++ b/lock-setting/lockscreen-options/include/lockscreen-options-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/lock-setting/lockscreen-options/include/lockscreen-options-util.h b/lock-setting/lockscreen-options/include/lockscreen-options-util.h index 4f9555e..b0ad283 100755 --- a/lock-setting/lockscreen-options/include/lockscreen-options-util.h +++ b/lock-setting/lockscreen-options/include/lockscreen-options-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/lock-setting/lockscreen-options/include/lockscreen-options.h b/lock-setting/lockscreen-options/include/lockscreen-options.h index 73bcd4d..37c478d 100755 --- a/lock-setting/lockscreen-options/include/lockscreen-options.h +++ b/lock-setting/lockscreen-options/include/lockscreen-options.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/lock-setting/lockscreen-options/src/lockscreen-options-main.c b/lock-setting/lockscreen-options/src/lockscreen-options-main.c index bb8aa6f..2ede565 100755 --- a/lock-setting/lockscreen-options/src/lockscreen-options-main.c +++ b/lock-setting/lockscreen-options/src/lockscreen-options-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/lock-setting/lockscreen-options/src/lockscreen-options-util.c b/lock-setting/lockscreen-options/src/lockscreen-options-util.c index 5660062..6f0b84c 100755 --- a/lock-setting/lockscreen-options/src/lockscreen-options-util.c +++ b/lock-setting/lockscreen-options/src/lockscreen-options-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/lock-setting/lockscreen-options/src/lockscreen-options.c b/lock-setting/lockscreen-options/src/lockscreen-options.c index f0bf105..de5eb00 100755 --- a/lock-setting/lockscreen-options/src/lockscreen-options.c +++ b/lock-setting/lockscreen-options/src/lockscreen-options.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/hw_key.c b/src/hw_key.c index 7435107..7e4c3fc 100755 --- a/src/hw_key.c +++ b/src/hw_key.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/lock-daemon.c b/src/lock-daemon.c index 3bd9615..2ceb5be 100755 --- a/src/lock-daemon.c +++ b/src/lock-daemon.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/lockd-debug.c b/src/lockd-debug.c index dda6bd5..72c7227 100755 --- a/src/lockd-debug.c +++ b/src/lockd-debug.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/lockd-process-mgr.c b/src/lockd-process-mgr.c index aab2797..f9bc863 100755 --- a/src/lockd-process-mgr.c +++ b/src/lockd-process-mgr.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/lockd-window-mgr.c b/src/lockd-window-mgr.c index dc05087..4d826e5 100755 --- a/src/lockd-window-mgr.c +++ b/src/lockd-window-mgr.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/menu_daemon.c b/src/menu_daemon.c index b400b5e..ebb5237 100755 --- a/src/menu_daemon.c +++ b/src/menu_daemon.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/pkg_event.c b/src/pkg_event.c index f3df8c5..46feba9 100755 --- a/src/pkg_event.c +++ b/src/pkg_event.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/starter.c b/src/starter.c index 67bc680..9a6a946 100755 --- a/src/starter.c +++ b/src/starter.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/x11.c b/src/x11.c index 01119ec..df41f28 100644 --- a/src/x11.c +++ b/src/x11.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/xmonitor.c b/src/xmonitor.c index cc8d481..4c87285 100755 --- a/src/xmonitor.c +++ b/src/xmonitor.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/test/get_entry.c b/test/get_entry.c index 029e6e5..ea35358 100755 --- a/test/get_entry.c +++ b/test/get_entry.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/test/get_theme.c b/test/get_theme.c index 2d4a202..2439ed5 100755 --- a/test/get_theme.c +++ b/test/get_theme.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/test/set_theme.c b/test/set_theme.c index 96c76f7..a6cf4eb 100755 --- a/test/set_theme.c +++ b/test/set_theme.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 * -- cgit v1.2.3