change the license from Flora to Apache 2.0

Signed-off-by: Ji-hoon Jung <jh8801.jung@samsung.com>
Change-Id: I28bc08ce214f90d0391a33d7e5eae1468d79922e

diff --git a/LICENSE.APLv2 b/LICENSE.APLv2
new file mode 100644 (file)
index 0000000..f724a31
--- /dev/null
+++ b/LICENSE.APLv2
@@ -0,0 +1,203 @@
+Copyright (c) 2012 - 2014 Samsung Electronics Co., Ltd. All rights reserved.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the 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.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   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.

diff --git a/LICENSE.Flora b/LICENSE.Flora
deleted file mode 100644 (file)
index 4a0af40..0000000
--- a/LICENSE.Flora
+++ /dev/null
@@ -1,206 +0,0 @@
-Flora License
-
-Version 1.1, April, 2013
-
-http://floralicense.org/license/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by
-the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and
-all other entities that control, are controlled by, or are
-under common control with that entity. For the purposes of
-this definition, "control" means (i) the power, direct or indirect,
-to cause the direction or management of such entity,
-whether by contract or otherwise, or (ii) ownership of fifty percent (50%)
-or more of the outstanding shares, or (iii) beneficial ownership of
-such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation source,
-and configuration files.
-
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form, including but
-not limited to compiled object code, generated documentation,
-and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form,
-made available under the License, as indicated by a copyright notice
-that is included in or attached to the work (an example is provided
-in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form,
-that is based on (or derived from) the Work and for which the editorial
-revisions, annotations, elaborations, or other modifications represent,
-as a whole, an original work of authorship. For the purposes of this License,
-Derivative Works shall not include works that remain separable from,
-or merely link (or bind by name) to the interfaces of, the Work and
-Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original
-version of the Work and any modifications or additions to that Work or
-Derivative Works thereof, that is intentionally submitted to Licensor
-for inclusion in the Work by the copyright owner or by an individual or
-Legal Entity authorized to submit on behalf of the copyright owner.
-For the purposes of this definition, "submitted" means any form of
-electronic, verbal, or written communication sent to the Licensor or
-its representatives, including but not limited to communication on
-electronic mailing lists, source code control systems, and issue
-tracking systems that are managed by, or on behalf of, the Licensor
-for the purpose of discussing and improving the Work, but excluding
-communication that is conspicuously marked or otherwise designated
-in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity
-on behalf of whom a Contribution has been received by Licensor and
-subsequently incorporated within the Work.
-
-"Tizen Certified Platform" shall mean a software platform that complies
-with the standards set forth in the Tizen Compliance Specification
-and passes the Tizen Compliance Tests as defined from time to time
-by the Tizen Technical Steering Group and certified by the Tizen
-Association or its designated agent.
-
-2. Grant of Copyright License.  Subject to the terms and conditions of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the
-Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License.  Subject to the terms and conditions of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have made,
-use, offer to sell, sell, import, and otherwise transfer the Work
-solely as incorporated into a Tizen Certified Platform, where such
-license applies only to those patent claims licensable by such
-Contributor that are necessarily infringed by their Contribution(s)
-alone or by combination of their Contribution(s) with the Work solely
-as incorporated into a Tizen Certified Platform to which such
-Contribution(s) was submitted. If You institute patent litigation
-against any entity (including a cross-claim or counterclaim
-in a lawsuit) alleging that the Work or a Contribution incorporated
-within the Work constitutes direct or contributory patent infringement,
-then any patent licenses granted to You under this License for that
-Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.  You may reproduce and distribute copies of the
-Work or Derivative Works thereof pursuant to the copyright license
-above, in any medium, with or without modifications, and in Source or
-Object form, provided that You meet the following conditions:
-
-  1. You must give any other recipients of the Work or Derivative Works
-     a copy of this License; and
-  2. You must cause any modified files to carry prominent notices stating
-     that You changed the files; and
-  3. You must retain, in the Source form of any Derivative Works that
-     You distribute, all copyright, patent, trademark, and attribution
-     notices from the Source form of the Work, excluding those notices
-     that do not pertain to any part of the Derivative Works; and
-  4. If the Work includes a "NOTICE" text file as part of its distribution,
-     then any Derivative Works that You distribute must include a readable
-     copy of the attribution notices contained within such NOTICE file,
-     excluding those notices that do not pertain to any part of
-     the Derivative Works, in at least one of the following places:
-     within a NOTICE text file distributed as part of the Derivative Works;
-     within the Source form or documentation, if provided along with the
-     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 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
-by You to the Licensor shall be under the terms and conditions of
-this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify
-the terms of any separate license agreement you may have executed
-with Licensor regarding such Contributions.
-
-6. Trademarks.  This License does not grant permission to use the trade
-names, trademarks, service marks, or product names of the Licensor,
-except as required for reasonable and customary use in describing the
-origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-agreed to in writing, Licensor provides the Work (and each
-Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied, including, without limitation, any warranties or conditions
-of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining the
-appropriateness of using or redistributing the Work and assume any
-risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise,
-unless required by applicable law (such as deliberate and grossly
-negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising as a
-result of this License or out of the use or inability to use the
-Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses), even if such Contributor
-has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer,
-and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with this
-License. However, in accepting such obligations, You may act only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason
-of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Flora License to your work
-
-To apply the Flora License to your work, attach the following
-boilerplate notice, with the fields enclosed by brackets "[]"
-replaced with your own identifying information. (Don't include
-the brackets!) The text should be enclosed in the appropriate
-comment syntax for the file format. We also recommend that a
-file or class name and description of purpose be included on the
-same "printed page" as the copyright notice for easier
-identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-

diff --git a/NOTICE b/NOTICE
index 6cfeb014f16c553c19b76c6e0447b782f29de95c..0b14c607e01bacf1b2f41bbe0dfc1fe08712c96d 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
-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.
+Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Apache License, Version 2.
+Please, see the LICENSE.APLv2 file for Apache License terms and conditions.
 
 The GPL license applies to the files in these directories:
 
@@ -8,7 +8,7 @@ data/org_ppd/epson
 data/epson
 
 Several source codes may have its original copyright owner and/or
-be licensed under other than Flora License, Version 1.1, say, GNU Public License, Version 2.
+be licensed under other than Apache License, Version 2., say, GNU Public License, Version 2.
 Please, see copyright and license comments section in the header of each file,
 and the LICENSE.GPLv2 for GNU Public License, Version 2 terms and conditions
 
@@ -222,6 +222,6 @@ data/org_ppd/hp/hp-officejet_pro_476_576_series-ps.ppd
 data/org_ppd/hp/hp-officejet_pro_8000_enterprise_a811a-ps.ppd
 
 Several source codes may have its original copyright owner and/or
-be licensed under other than Flora License, Version 1.1, say, MIT License.
+be licensed under other than Apache License, Version 2., say, MIT License.
 Please, see copyright and license comments section in the header of each file,
 and the LICENSE.MIT for MIT License terms and conditions

diff --git a/TC/getppd.c b/TC/getppd.c
index b460584a8acb29643c5814013fb60dc2a5adbfa5..f597e3a44f15c16da5defa63f1cd53f088d8cbe8 100644 (file)
--- a/TC/getppd.c
+++ b/TC/getppd.c
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2013  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/TC/getppd.h b/TC/getppd.h
index 40e56b54c754ebb913e1bd8e9ae448cd61446f5c..54c2646f7c7aabc88090ae0d509a11e9255f3191 100644 (file)
--- a/TC/getppd.h
+++ b/TC/getppd.h
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2013  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/TC/ppd_compare.c b/TC/ppd_compare.c
index 64aec9575964351e0323aff8c1f528af6a3ee1f6..2908268f0b93ab46bbfb419114466787610fada3 100644 (file)
--- a/TC/ppd_compare.c
+++ b/TC/ppd_compare.c
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/TC/test-automation.c b/TC/test-automation.c
index 1ed14c71946f14d5df571689d516618f34b56f0b..941918b195166a0987ffa4170ea3af9d194fd4d3 100644 (file)
--- a/TC/test-automation.c
+++ b/TC/test-automation.c
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/drvopt/drv/drv.go b/drvopt/drv/drv.go
index 9118e168c68aae8a72ac096eee5f4e8a2be13dde..4ff649e1b10aa5ce391c2192e04242da257cc0ed 100644 (file)
--- a/drvopt/drv/drv.go
+++ b/drvopt/drv/drv.go
@@ -1,19 +1,19 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.
+* limitations under the License.*
 *
 */
 
@@ -202,7 +202,7 @@ func (t *Drv) find_node(model *Drv) (bool, map[string]string, *Drv) {
        found := false
        foundequal := false
        foundnode := t.root
-       
+
        for e := foundnode.children.Front(); e != nil; {
                tmpcoinc = make(map[string]string)
                for _, comprop := range e.Value.(*Drv).props { // all properties of node
@@ -219,15 +219,15 @@ func (t *Drv) find_node(model *Drv) (bool, map[string]string, *Drv) {
                                        break
                                }
                        }
-                       
+
                        for _, prop := range model.props { // all properties of model
                                if prop == comprop { // properties are equal
                                        tmpcoinc[prop] = prop
                                        found = true
                                        continue
                                }
-                               
-                               if ((strings.HasPrefix(comprop, "  Group") == true && strings.HasPrefix(prop, "  Group") == true) || 
+
+                               if ((strings.HasPrefix(comprop, "  Group") == true && strings.HasPrefix(prop, "  Group") == true) ||
                                (strings.HasPrefix(comprop, "  Attribute") == true && strings.HasPrefix(prop, "  Attribute") == true) ||
                                (strings.HasPrefix(comprop, "  *CustomMedia") == true && strings.HasPrefix(prop, "  *CustomMedia") == true) ||
                                (strings.HasPrefix(comprop, "  CustomMedia") == true && strings.HasPrefix(prop, "  CustomMedia") == true)) {
@@ -676,7 +676,7 @@ func (t* Drvm) PrintProduct(product string, fileto *os.File) error {
                                                fileto.WriteString(t.strs[x])
                                        } // for
                                        return nil;
-                               } // if strings.... 
+                               } // if strings....
                        } // if sl...
                } // for
        } // for

diff --git a/drvopt/drvopt.go b/drvopt/drvopt.go
index 0f5d58886b7c78e122e1ee15c2566e741c6f757b..a18457d32b22ce3a6adc2c60e9b3245bf6076069 100644 (file)
--- a/drvopt/drvopt.go
+++ b/drvopt/drvopt.go
@@ -1,19 +1,19 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.
+* limitations under the License.*
 *
 */
 

diff --git a/include/pt_api.h b/include/pt_api.h
index 4bd38f31ddcab33a0d76b8ccb6d8a2e8e439d0fa..766ced4ece2e26eea0c8f6625f08b2b020a03dd9 100644 (file)
--- a/include/pt_api.h
+++ b/include/pt_api.h
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/include/pt_common.h b/include/pt_common.h
index 564bb95551dfb13bd3c072fb67d367c0f52f982c..d71fe7e528155d8024835958fb381906cf958289 100644 (file)
--- a/include/pt_common.h
+++ b/include/pt_common.h
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/include/pt_db.h b/include/pt_db.h
index 6677e9e3b17530c0bc6f730fd9f493f465078fc8..50a813777d4d3e2d8feae28a6ef7e4a055f305be 100644 (file)
--- a/include/pt_db.h
+++ b/include/pt_db.h
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2013  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/include/pt_debug.h b/include/pt_debug.h
index 5ab80a8ac2913fbe2b5c7c160f3d08bb88c3ca83..64254060e4fb2395f1cc9e45fe27fb34096f2981 100644 (file)
--- a/include/pt_debug.h
+++ b/include/pt_debug.h
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/include/pt_job.h b/include/pt_job.h
index 2fd42e11b270a6489a7bc01f5ed892f19f4288b9..4ad1f95b4c0ef030368ff3ba7d3e7393df6675a8 100644 (file)
--- a/include/pt_job.h
+++ b/include/pt_job.h
@@ -1,14 +1,14 @@
 /*
-*  Printservice
+*      Printservice
 *
-* Copyright 2013  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/include/pt_optionmapping.h b/include/pt_optionmapping.h
index bd2f8ef80ba064bbf50ac9549fd3950e354d0330..2e6df8dea366bdea3de79b0924acaabaabad6900 100644 (file)
--- a/include/pt_optionmapping.h
+++ b/include/pt_optionmapping.h
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/include/pt_ppd.h b/include/pt_ppd.h
index 8d770276579f4ab8d3d8e6bcf898876813965af5..4133ea7925c21d1fb48371d824280b9200898cc7 100644 (file)
--- a/include/pt_ppd.h
+++ b/include/pt_ppd.h
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/include/pt_printer.h b/include/pt_printer.h
index 0ae07b18b87708462714b27fc9f5a29b66c01877..ef374acb2951c5e469b4b5d11fbe6d13d14c5210 100644 (file)
--- a/include/pt_printer.h
+++ b/include/pt_printer.h
@@ -1,14 +1,14 @@
 /*
-*  Printservice
+*      Printservice
 *
-* Copyright 2013  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/include/pt_status.h b/include/pt_status.h
index c40f08510a20c5879f9cafe06412f40796a81ecb..f92f1d580b0ea742147efa202b80fb4a1de0140a 100644 (file)
--- a/include/pt_status.h
+++ b/include/pt_status.h
@@ -1,14 +1,14 @@
 /*
-*  Printservice
+*      Printservice
 *
-* Copyright 2013  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/include/pt_test.h b/include/pt_test.h
index b2fea885a3840b82a9d15c11eaba0cf35aac9c8e..42c80ce7c281ab5414c3583ef7248804a1c77846 100644 (file)
--- a/include/pt_test.h
+++ b/include/pt_test.h
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/include/pt_utils.h b/include/pt_utils.h
index 5fb3e3dcc96136a660ff71af57b35af736cf7788..d806a66c012e7305bd98c6afb89b12798fc50e4e 100644 (file)
--- a/include/pt_utils.h
+++ b/include/pt_utils.h
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/libptdb/ptdb.c b/libptdb/ptdb.c
index 78996e5d25bef117f26fd1b5b96df38e733c969c..76cd5de34ec47b6d0739be45e3ccca17c4797b4a 100644 (file)
--- a/libptdb/ptdb.c
+++ b/libptdb/ptdb.c
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2013  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/packaging/print-service.spec b/packaging/print-service.spec
index 72916aad1bb16bbeb7c3877fe5711906e2c81266..7d27e35eaba107b3bda7ca4d12907747da4976b0 100755 (executable)
--- a/packaging/print-service.spec
+++ b/packaging/print-service.spec
@@ -3,11 +3,11 @@ Summary:    Print service library
 Version:    1.2.9
 Release:    0
 Group:      System/Libraries
-License:    Flora
+License:    Apache-2.0 and GPL-2.0 and MIT
 Source0:    %{name}-%{version}.tar.gz
 Source1001: print-service.manifest
 Source1002: print-driver-data.manifest
-Source1003: print-service-tests.manifest 
+Source1003: print-service-tests.manifest
 BuildRequires:    cmake
 BuildRequires:    pkgconfig(dlog)
 BuildRequires:    pkgconfig(eina)
@@ -66,8 +66,9 @@ cp %{SOURCE1003} .
 rm -rf %{buildroot}
 %make_install
 mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{buildsubdir}/LICENSE.Flora %{buildroot}/usr/share/license/%{name}
-cp %{_builddir}/%{buildsubdir}/LICENSE.Flora %{buildroot}/usr/share/license/print-driver-data
+cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
+cp %{_builddir}/%{buildsubdir}/LICENSE.GPLv2 %{buildroot}/usr/share/license/print-driver-data
+cat %{_builddir}/%{buildsubdir}/LICENSE.MIT >> %{buildroot}/usr/share/license/print-driver-data
 
 %clean
 rm -rf %{buildroot}

diff --git a/src/pt_job.c b/src/pt_job.c
index 9aaabc97f011a043652bb7abb2c0b5941ae4a4a9..7425f58d25326702bf50aaee65b1a6879e351a76 100644 (file)
--- a/src/pt_job.c
+++ b/src/pt_job.c
@@ -1,14 +1,14 @@
 /*
-*  Printservice
+*      Printservice
 *
-* Copyright 2013  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.
@@ -16,6 +16,7 @@
 * limitations under the License.
 *
 */
+
 #define _GNU_SOURCE
 #include <string.h>
 #include <math.h>

diff --git a/src/pt_optionkeywords.c b/src/pt_optionkeywords.c
index 0ad0733acf32df66dbfe972cc98f036821e7666a..99d7a6342396911ad189bd4abd4aecb3c0d53589 100644 (file)
--- a/src/pt_optionkeywords.c
+++ b/src/pt_optionkeywords.c
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/src/pt_optionmapping.c b/src/pt_optionmapping.c
index 64903dd1911a997b47c94a23afa0b44b0fb3342b..e20cecefcda2acd8f6553167839deb920110a8b9 100644 (file)
--- a/src/pt_optionmapping.c
+++ b/src/pt_optionmapping.c
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/src/pt_ppd.c b/src/pt_ppd.c
index 54fe3de56833f6d3e34770d6bc50797fedbeb7c1..e91dd53383f9b6bdabc9085c123fcd32a60429b1 100644 (file)
--- a/src/pt_ppd.c
+++ b/src/pt_ppd.c
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/src/pt_printer.c b/src/pt_printer.c
index 6110e357e524848a288c216f173472664eb6c3ae..fc8253a947a9ab09487eb2fd79409af5e3fadd2e 100644 (file)
--- a/src/pt_printer.c
+++ b/src/pt_printer.c
@@ -1,14 +1,14 @@
 /*
-*  Printservice
+*      Printservice
 *
-* Copyright 2013  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/src/pt_service.c b/src/pt_service.c
index 2434609144682bb6f02378c7f0215b92cbfe9334..3caaa9f60c8d58e7337e85b3f89ed7bb4edd3e00 100644 (file)
--- a/src/pt_service.c
+++ b/src/pt_service.c
@@ -1,14 +1,14 @@
 /*
-*  Printservice
+*      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/src/pt_status.c b/src/pt_status.c
index c40f08510a20c5879f9cafe06412f40796a81ecb..f92f1d580b0ea742147efa202b80fb4a1de0140a 100644 (file)
--- a/src/pt_status.c
+++ b/src/pt_status.c
@@ -1,14 +1,14 @@
 /*
-*  Printservice
+*      Printservice
 *
-* Copyright 2013  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.

diff --git a/src/pt_utils.c b/src/pt_utils.c
index aa29a24dbd91571c2e7199da297fb2f3815c6e02..bbc8dc2c6bc4a7a2439836134eea195da5c01b9f 100644 (file)
--- a/src/pt_utils.c
+++ b/src/pt_utils.c
@@ -1,14 +1,14 @@
 /*
 *      Printservice
 *
-* Copyright 2012  Samsung Electronics Co., Ltd
-
-* Licensed under the Flora License, Version 1.1 (the "License");
+* Copyright (c) 2012-2014 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (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://www.apache.org/licenses/LICENSE-2.0
+*
 * 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.