From: Goo Lee Date: Tue, 7 May 2013 15:07:19 +0000 (+0900) Subject: [Request]Update Flora license version X-Git-Tag: submit/tizen_2.1/20130514.053557~1 X-Git-Url: http://review.tizen.org/git/?p=apps%2Fcore%2Fpreloaded%2Fcalculator.git;a=commitdiff_plain;h=71b8e7ca2c326cf1027decad5556b711d36fb317 [Request]Update Flora license version --- diff --git a/LICENSE b/LICENSE index a2ae71e..249b868 100644 --- a/LICENSE +++ b/LICENSE @@ -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 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/NOTICE b/NOTICE index ded3804..6e010c0 100644 --- a/NOTICE +++ b/NOTICE @@ -1 +1,3 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. \ No newline at end of file +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/calculator.edc b/calculator.edc index 1ebc6ad..a75d34c 100644 --- a/calculator.edc +++ b/calculator.edc @@ -2,7 +2,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/edc/Inc.calculator.main.edc b/edc/Inc.calculator.main.edc index 858c6db..a6dc3ab 100755 --- a/edc/Inc.calculator.main.edc +++ b/edc/Inc.calculator.main.edc @@ -2,7 +2,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/edc/Inc.calculator.pannel.lan.edc b/edc/Inc.calculator.pannel.lan.edc index 0a4edc0..5c48928 100644 --- a/edc/Inc.calculator.pannel.lan.edc +++ b/edc/Inc.calculator.pannel.lan.edc @@ -2,7 +2,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/edc/Inc.calculator.pannel.por.edc b/edc/Inc.calculator.pannel.por.edc index feff69d..d7018b5 100644 --- a/edc/Inc.calculator.pannel.por.edc +++ b/edc/Inc.calculator.pannel.por.edc @@ -2,7 +2,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/edc/edc-macro.edc b/edc/edc-macro.edc index c1de692..742efb3 100644 --- a/edc/edc-macro.edc +++ b/edc/edc-macro.edc @@ -2,7 +2,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/calc-expression.h b/include/calc-expression.h index e2f45fd..626aa41 100644 --- a/include/calc-expression.h +++ b/include/calc-expression.h @@ -2,7 +2,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/calc-main.h b/include/calc-main.h index e21ad63..897b782 100644 --- a/include/calc-main.h +++ b/include/calc-main.h @@ -2,7 +2,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/calc-string.h b/include/calc-string.h index d490ba3..6856e52 100644 --- a/include/calc-string.h +++ b/include/calc-string.h @@ -2,7 +2,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/calc-view.h b/include/calc-view.h index 83c1244..28b2db4 100644 --- a/include/calc-view.h +++ b/include/calc-view.h @@ -2,7 +2,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/calculator_parser.h b/include/calculator_parser.h index 44099f3..be7129e 100644 --- a/include/calculator_parser.h +++ b/include/calculator_parser.h @@ -2,7 +2,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/calc-expression.c b/src/calc-expression.c index c74eb69..dcba8b8 100644 --- a/src/calc-expression.c +++ b/src/calc-expression.c @@ -2,7 +2,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/calc-main.c b/src/calc-main.c index b75397b..0faa445 100644 --- a/src/calc-main.c +++ b/src/calc-main.c @@ -2,7 +2,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/calc-string.c b/src/calc-string.c index fe03742..7e831d3 100644 --- a/src/calc-string.c +++ b/src/calc-string.c @@ -2,7 +2,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/calc-view.c b/src/calc-view.c index 6bcef03..f9128df 100755 --- a/src/calc-view.c +++ b/src/calc-view.c @@ -2,7 +2,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/calculator_edje.c b/src/calculator_edje.c index 3ca2b9a..30937d8 100644 --- a/src/calculator_edje.c +++ b/src/calculator_edje.c @@ -2,7 +2,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/calculator_parser.c b/src/calculator_parser.c index c8cc7a1..8af965c 100644 --- a/src/calculator_parser.c +++ b/src/calculator_parser.c @@ -2,7 +2,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/theme/calculator_theme.edc b/theme/calculator_theme.edc index c7f2f72..4b5d326 100644 --- a/theme/calculator_theme.edc +++ b/theme/calculator_theme.edc @@ -2,7 +2,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 *