Changed Flora license

Change-Id: I37628db2861b44717144b63afa24bb44953c4ba8

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36f1d61ce22c607611e4684c41a74226992..4a0af40baef878b747eaf9e3d1081e3447609ff5 100644 (file)
--- 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.Flora b/NOTICE.Flora
index f37f329b30df26c518e0befc894b45dbbb492a95..2c574b9ecb5a48b3255f60e2dd9f7e7eb2a72411 100644 (file)
--- 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.
+Except as noted, this software is licensed under Flora License, Version 1.1
 Please, see the LICENSE.Flora file for Flora License terms and conditions.
 

diff --git a/TC/getppd.c b/TC/getppd.c
index 0e91fbf8aa841a0007e63b86340233d098c42f35..b460584a8acb29643c5814013fb60dc2a5adbfa5 100644 (file)
--- a/TC/getppd.c
+++ b/TC/getppd.c
@@ -1,3 +1,21 @@
+/*
+*      Printservice
+*
+* Copyright 2013  Samsung Electronics Co., Ltd
+
+* 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.
+*
+*/
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -187,4 +205,4 @@ int main(int argc, char **argv)
 
        printf("%s", output);
        exit(EXIT_SUCCESS);
-}
\ No newline at end of file
+}

diff --git a/TC/getppd.h b/TC/getppd.h
index eeceeab805f2bdfeb310b4dbcdff4b2c1b33a5c1..40e56b54c754ebb913e1bd8e9ae448cd61446f5c 100644 (file)
--- a/TC/getppd.h
+++ b/TC/getppd.h
@@ -1,3 +1,22 @@
+/*
+*      Printservice
+*
+* Copyright 2013  Samsung Electronics Co., Ltd
+
+* 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.
+*
+*/
+
 #ifndef __PRINT_GETPPD_H__
 #define __PRINT_GETPPD_H__
 
@@ -48,4 +67,4 @@ bool clean_tmp_file(const char *file, pt_clean_file type);
 /* Output help strings */
 void help(void);
 
-#endif /* __PRINT_GETPPD_H__ */
\ No newline at end of file
+#endif /* __PRINT_GETPPD_H__ */

diff --git a/TC/ppd_compare.c b/TC/ppd_compare.c
index 65f15608ed7188b337c1d2af36b98bc356f9d498..64aec9575964351e0323aff8c1f528af6a3ee1f6 100644 (file)
--- a/TC/ppd_compare.c
+++ b/TC/ppd_compare.c
@@ -3,7 +3,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/TC/test-automation.c b/TC/test-automation.c
index bb252bda14e850d0ad6c87918e91da8b8ba7f9cf..1ed14c71946f14d5df571689d516618f34b56f0b 100644 (file)
--- a/TC/test-automation.c
+++ b/TC/test-automation.c
@@ -3,7 +3,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/drvopt/drv/drv.go b/drvopt/drv/drv.go
index f341c3b03d773cf93ac6ee31275d56e4bf3cbe5d..8570e9f9e4bb29f2bb0f247939b01431d74c10b3 100644 (file)
--- a/drvopt/drv/drv.go
+++ b/drvopt/drv/drv.go
@@ -1,3 +1,22 @@
+/*
+*      Printservice
+*
+* Copyright 2013  Samsung Electronics Co., Ltd
+
+* 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.
+*
+*/
+
 package drv
 
 import (

diff --git a/drvopt/drvopt.go b/drvopt/drvopt.go
index 59a5e9780aff3e2feb1d330bd5e4e0bf225193bc..0f5d58886b7c78e122e1ee15c2566e741c6f757b 100644 (file)
--- a/drvopt/drvopt.go
+++ b/drvopt/drvopt.go
@@ -3,7 +3,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/drvopt/getdrv.go b/drvopt/getdrv.go
index c4644b635adfa0f402aa640b77bc37aa00d27e9e..8939e297af7c0b48e1734c92eb0dd42e408fa4a9 100644 (file)
--- a/drvopt/getdrv.go
+++ b/drvopt/getdrv.go
@@ -3,7 +3,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/pt_api.h b/include/pt_api.h
index f7ead41bdc3f2ec7716554908d865e1ea89b2840..4bd38f31ddcab33a0d76b8ccb6d8a2e8e439d0fa 100644 (file)
--- a/include/pt_api.h
+++ b/include/pt_api.h
@@ -3,7 +3,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/pt_common.h b/include/pt_common.h
index 95992cf6ce963db7283d401791136c6f05b5df4d..564bb95551dfb13bd3c072fb67d367c0f52f982c 100644 (file)
--- a/include/pt_common.h
+++ b/include/pt_common.h
@@ -3,7 +3,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/pt_db.h b/include/pt_db.h
index 3108ee93dd60e69529201bb1912a9eda9eebb077..f5413b2b32d83dbad1341e6e481f3419d4fd92fe 100644 (file)
--- a/include/pt_db.h
+++ b/include/pt_db.h
@@ -3,7 +3,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/pt_debug.h b/include/pt_debug.h
index 1846e6c8bad60ba5e6c95826bf7bc9af86c57c07..5ab80a8ac2913fbe2b5c7c160f3d08bb88c3ca83 100644 (file)
--- a/include/pt_debug.h
+++ b/include/pt_debug.h
@@ -3,7 +3,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/pt_job.h b/include/pt_job.h
index 2544d0062c65c991c91667967596060c83d7884c..5cb9a2505b7d72e341b9622e868789520f952d64 100644 (file)
--- a/include/pt_job.h
+++ b/include/pt_job.h
@@ -3,7 +3,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/pt_optionmapping.h b/include/pt_optionmapping.h
index 91d8cb74452de1a33dbe4f6a93ea31ad8bd26dcd..ff13b1909474b0b738a88c63758992ba093c350c 100644 (file)
--- a/include/pt_optionmapping.h
+++ b/include/pt_optionmapping.h
@@ -3,7 +3,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/pt_ppd.h b/include/pt_ppd.h
index 2288366697a6971e8d70018c450accbbb2b8cd6f..6bf76e0876f790f62bb7c5550cf618f5857134d6 100644 (file)
--- a/include/pt_ppd.h
+++ b/include/pt_ppd.h
@@ -3,7 +3,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/pt_printer.h b/include/pt_printer.h
index 9ce27080bdb9770ac837ad83dc53d86de8518294..38aad7c47c7cefe4c8d366cecf0962cb8e207cbe 100644 (file)
--- a/include/pt_printer.h
+++ b/include/pt_printer.h
@@ -3,7 +3,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/pt_status.h b/include/pt_status.h
index 85260ddcb0f6cf719a9472a2edf4124a1f299602..939721a43857ac678b497ed8d8bb113dcf6bac18 100644 (file)
--- a/include/pt_status.h
+++ b/include/pt_status.h
@@ -3,7 +3,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/pt_test.h b/include/pt_test.h
index 96aed2847277c7aefabb46db913f40e8ca2c00b1..b2fea885a3840b82a9d15c11eaba0cf35aac9c8e 100644 (file)
--- a/include/pt_test.h
+++ b/include/pt_test.h
@@ -3,7 +3,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/pt_utils.h b/include/pt_utils.h
index abaac04de2dbbafaa33d70af1799a3b58384936e..5fb3e3dcc96136a660ff71af57b35af736cf7788 100644 (file)
--- a/include/pt_utils.h
+++ b/include/pt_utils.h
@@ -3,7 +3,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/libptdb/ptdb.c b/libptdb/ptdb.c
index ccd2f886f36f366d7a35255ce6ab4e9f382d08e9..40ae9e4d0e28c32711e6a6fd4d394f6769aedb9f 100644 (file)
--- a/libptdb/ptdb.c
+++ b/libptdb/ptdb.c
@@ -3,7 +3,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/pt_job.c b/src/pt_job.c
index 6b97aca072d443b50f33b02508747947ea4554be..310651e167c150e4f844d42e5294b4ebf12ff98d 100644 (file)
--- a/src/pt_job.c
+++ b/src/pt_job.c
@@ -3,7 +3,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/pt_optionkeywords.c b/src/pt_optionkeywords.c
index 36c8cde4ced8d012200dfaa60da7d5dea669df63..0ad0733acf32df66dbfe972cc98f036821e7666a 100644 (file)
--- a/src/pt_optionkeywords.c
+++ b/src/pt_optionkeywords.c
@@ -3,7 +3,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/pt_optionmapping.c b/src/pt_optionmapping.c
index 66ac5ae94e3c88b80edcbb2839a2eecd36e0107e..64903dd1911a997b47c94a23afa0b44b0fb3342b 100644 (file)
--- a/src/pt_optionmapping.c
+++ b/src/pt_optionmapping.c
@@ -3,7 +3,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/pt_ppd.c b/src/pt_ppd.c
index 0983adf5cf053d3e9e80e6ce704be0e0d8a8dc60..d83421a934d62b332f577970a4e84e94b91a773a 100644 (file)
--- a/src/pt_ppd.c
+++ b/src/pt_ppd.c
@@ -3,7 +3,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/pt_printer.c b/src/pt_printer.c
index 6ad928a9143efe3e5c77c33b113915c9bf37f126..cbde8ef41d66869016dc331c3b2b08e147849ac2 100644 (file)
--- a/src/pt_printer.c
+++ b/src/pt_printer.c
@@ -3,7 +3,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/pt_service.c b/src/pt_service.c
index 0bf7a1b58e1fe4a18a8a6f7b6b8e5c71644a08d0..2434609144682bb6f02378c7f0215b92cbfe9334 100644 (file)
--- a/src/pt_service.c
+++ b/src/pt_service.c
@@ -3,7 +3,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/pt_status.c b/src/pt_status.c
index 85260ddcb0f6cf719a9472a2edf4124a1f299602..939721a43857ac678b497ed8d8bb113dcf6bac18 100644 (file)
--- a/src/pt_status.c
+++ b/src/pt_status.c
@@ -3,7 +3,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/pt_utils.c b/src/pt_utils.c
index 194b4552eb726a294a63f05a2277e0a832366c09..aa29a24dbd91571c2e7199da297fb2f3815c6e02 100644 (file)
--- a/src/pt_utils.c
+++ b/src/pt_utils.c
@@ -3,7 +3,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