From 14b605ede6cb54a97e535b0a1e93152788542dfa Mon Sep 17 00:00:00 2001 From: Gongwook Lee Date: Mon, 29 Apr 2013 18:16:13 +0900 Subject: [PATCH] Fix flora license version Change-Id: Idae7d70296e1031ebe58ee5bc9e8c34aed5da40c Signed-off-by: Gongwook Lee --- LICENSE.Flora | 26 +++++++++++++------------- NOTICE | 4 ++-- src/ImageFeatureInfo.h | 8 ++++---- src/ImageFeatureManager.h | 8 ++++---- src/ImageRecognitionInfo.h | 8 ++++---- src/ImageRecognizer.h | 8 ++++---- src/QRCodeGenerator.h | 8 ++++---- src/QRCodeRecognitionInfo.h | 8 ++++---- src/QRCodeRecognizer.h | 8 ++++---- src/QRCodeTypes.h | 8 ++++---- 10 files changed, 47 insertions(+), 47 deletions(-) mode change 100755 => 100644 LICENSE.Flora mode change 100755 => 100644 NOTICE mode change 100755 => 100644 src/ImageFeatureInfo.h mode change 100755 => 100644 src/ImageFeatureManager.h mode change 100755 => 100644 src/ImageRecognitionInfo.h diff --git a/LICENSE.Flora b/LICENSE.Flora old mode 100755 new mode 100644 index fd90a36..571fe79 --- 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 old mode 100755 new mode 100644 index 521a220..64d4fbe --- a/NOTICE +++ b/NOTICE @@ -2,5 +2,5 @@ Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. All rights reserved. Except as noted, this software is licensed under Apache License, Version 2. Please, see the LICENSE.Apache-2.0 file for Apache License terms and conditions. -libarengine.so, ImageFeatureInfo.h, ImageFeatureManager.h, ImageRecognitionInfo.h, ImageRecognizer.h, QRCodeGenerator.h, QRCodeRecognitionInfo.h, QRCodeRecognizer.h, and QRCodeTypes.h files are licensed under Flora License, Version 1 -Please, see LICENSE.Flora file for Flora License, Version 1 terms and conditions +libarengine.so, ImageFeatureInfo.h, ImageFeatureManager.h, ImageRecognitionInfo.h, ImageRecognizer.h, QRCodeGenerator.h, QRCodeRecognitionInfo.h, QRCodeRecognizer.h, and QRCodeTypes.h files are licensed under Flora License, Version 1.1 +Please, see LICENSE.Flora file for Flora License, Version 1.1 terms and conditions diff --git a/src/ImageFeatureInfo.h b/src/ImageFeatureInfo.h old mode 100755 new mode 100644 index e094417..76cd0dc --- a/src/ImageFeatureInfo.h +++ b/src/ImageFeatureInfo.h @@ -1,12 +1,12 @@ // -// Tizen C++ SDK -// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// 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 // -// http://floralicense.org/license +// 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, diff --git a/src/ImageFeatureManager.h b/src/ImageFeatureManager.h old mode 100755 new mode 100644 index 879ba77..0e9488a --- a/src/ImageFeatureManager.h +++ b/src/ImageFeatureManager.h @@ -1,12 +1,12 @@ // -// Tizen C++ SDK -// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// 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 // -// http://floralicense.org/license +// 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, diff --git a/src/ImageRecognitionInfo.h b/src/ImageRecognitionInfo.h old mode 100755 new mode 100644 index f2347ad..66a3ba9 --- a/src/ImageRecognitionInfo.h +++ b/src/ImageRecognitionInfo.h @@ -1,12 +1,12 @@ // -// Tizen C++ SDK -// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// 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 // -// http://floralicense.org/license +// 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, diff --git a/src/ImageRecognizer.h b/src/ImageRecognizer.h index fb2fd44..fccf41e 100644 --- a/src/ImageRecognizer.h +++ b/src/ImageRecognizer.h @@ -1,12 +1,12 @@ // -// Tizen C++ SDK -// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// 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 // -// http://floralicense.org/license +// 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, diff --git a/src/QRCodeGenerator.h b/src/QRCodeGenerator.h index c9d58c7..6ca1a58 100644 --- a/src/QRCodeGenerator.h +++ b/src/QRCodeGenerator.h @@ -1,12 +1,12 @@ // -// Tizen C++ SDK -// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// 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 // -// http://floralicense.org/license +// 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, diff --git a/src/QRCodeRecognitionInfo.h b/src/QRCodeRecognitionInfo.h index 650e924..b52069b 100644 --- a/src/QRCodeRecognitionInfo.h +++ b/src/QRCodeRecognitionInfo.h @@ -1,12 +1,12 @@ // -// Tizen C++ SDK -// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// 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 // -// http://floralicense.org/license +// 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, diff --git a/src/QRCodeRecognizer.h b/src/QRCodeRecognizer.h index 36c0354..dd1926d 100644 --- a/src/QRCodeRecognizer.h +++ b/src/QRCodeRecognizer.h @@ -1,12 +1,12 @@ // -// Tizen C++ SDK -// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// 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 // -// http://floralicense.org/license +// 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, diff --git a/src/QRCodeTypes.h b/src/QRCodeTypes.h index c9141aa..4a56d2c 100644 --- a/src/QRCodeTypes.h +++ b/src/QRCodeTypes.h @@ -1,12 +1,12 @@ // -// Tizen C++ SDK -// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// 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 // -// http://floralicense.org/license +// 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, -- 2.7.4