diff options
author | Beth Flanagan <elizabeth.flanagan@intel.com> | 2011-06-15 13:52:23 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-23 23:44:49 +0100 |
commit | 7cd2ac0e40d854bab9a32512018aff6172500c0e (patch) | |
tree | 99366a7b07db9f0b53bb9d411f0016f36982616d /meta/files/common-licenses/Libpng | |
parent | 879a7f819b7f38cda82d97489af433310aabfed1 (diff) | |
download | poky-7cd2ac0e40d854bab9a32512018aff6172500c0e.tar.gz |
common-licenses: Additions and corrections
I've added more licenses from SPDX and corrected the gcc license
so that it is a. parsable and b. accurate to the SPDX standard.
I've also done some cleanup of license text and gdb's LICENSE
field.
(From OE-Core rev: e47343d12ee571281238bbf5663b074c0e32049f)
Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files/common-licenses/Libpng')
-rw-r--r-- | meta/files/common-licenses/Libpng | 79 |
1 files changed, 35 insertions, 44 deletions
diff --git a/meta/files/common-licenses/Libpng b/meta/files/common-licenses/Libpng index ce3ddb0264..a9d5b031b0 100644 --- a/meta/files/common-licenses/Libpng +++ b/meta/files/common-licenses/Libpng | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | This copy of the libpng notices is provided for your convenience. In case of | 2 | This copy of the libpng notices is provided for your convenience. In case of |
3 | any discrepancy between this copy and the notices in the file png.h that is | 3 | any discrepancy between this copy and the notices in the file png.h that is |
4 | included in the libpng distribution, the latter shall prevail. | 4 | included in the libpng distribution, the latter shall prevail. |
5 | 5 | ||
@@ -15,65 +15,63 @@ Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are | |||
15 | distributed according to the same disclaimer and license as libpng-1.2.5 | 15 | distributed according to the same disclaimer and license as libpng-1.2.5 |
16 | with the following individual added to the list of Contributing Authors | 16 | with the following individual added to the list of Contributing Authors |
17 | 17 | ||
18 | Cosmin Truta | 18 | Cosmin Truta |
19 | 19 | ||
20 | libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are | 20 | libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are |
21 | Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are | 21 | Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are |
22 | distributed according to the same disclaimer and license as libpng-1.0.6 | 22 | distributed according to the same disclaimer and license as libpng-1.0.6 |
23 | with the following individuals added to the list of Contributing Authors | 23 | with the following individuals added to the list of Contributing Authors |
24 | 24 | ||
25 | Simon-Pierre Cadieux | 25 | Simon-Pierre Cadieux |
26 | Eric S. Raymond | 26 | Eric S. Raymond |
27 | Gilles Vollant | 27 | Gilles Vollant |
28 | 28 | ||
29 | and with the following additions to the disclaimer: | 29 | and with the following additions to the disclaimer: |
30 | 30 | ||
31 | There is no warranty against interference with your enjoyment of the | 31 | There is no warranty against interference with your enjoyment of the |
32 | library or against infringement. There is no warranty that our | 32 | library or against infringement. There is no warranty that our |
33 | efforts or the library will fulfill any of your particular purposes | 33 | efforts or the library will fulfill any of your particular purposes |
34 | or needs. This library is provided with all faults, and the entire | 34 | or needs. This library is provided with all faults, and the entire |
35 | risk of satisfactory quality, performance, accuracy, and effort is with | 35 | risk of satisfactory quality, performance, accuracy, and effort is with |
36 | the user. | 36 | the user. |
37 | 37 | ||
38 | libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are | 38 | libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are |
39 | Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are | 39 | Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are |
40 | distributed according to the same disclaimer and license as libpng-0.96, | 40 | distributed according to the same disclaimer and license as libpng-0.96, |
41 | with the following individuals added to the list of Contributing Authors: | 41 | with the following individuals added to the list of Contributing Authors: |
42 | 42 | ||
43 | Tom Lane | 43 | Tom Lane |
44 | Glenn Randers-Pehrson | 44 | Glenn Randers-Pehrson |
45 | Willem van Schaik | 45 | Willem van Schaik |
46 | 46 | ||
47 | libpng versions 0.89, June 1996, through 0.96, May 1997, are | 47 | libpng versions 0.89, June 1996, through 0.96, May 1997, are |
48 | Copyright (c) 1996, 1997 Andreas Dilger | 48 | Copyright (c) 1996, 1997 Andreas Dilger |
49 | Distributed according to the same disclaimer and license as libpng-0.88, | 49 | Distributed according to the same disclaimer and license as libpng-0.88, |
50 | with the following individuals added to the list of Contributing Authors: | 50 | with the following individuals added to the list of Contributing Authors: |
51 | 51 | ||
52 | John Bowler | 52 | John Bowler |
53 | Kevin Bracey | 53 | Kevin Bracey |
54 | Sam Bushell | 54 | Sam Bushell |
55 | Magnus Holmgren | 55 | Magnus Holmgren |
56 | Greg Roelofs | 56 | Greg Roelofs |
57 | Tom Tanner | 57 | Tom Tanner |
58 | 58 | ||
59 | libpng versions 0.5, May 1995, through 0.88, January 1996, are | 59 | libpng versions 0.5, May 1995, through 0.88, January 1996, are |
60 | Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. | 60 | Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. |
61 | 61 | ||
62 | For the purposes of this copyright and license, "Contributing | 62 | For the purposes of this copyright and license, "Contributing Authors" |
63 | Authors" | ||
64 | is defined as the following set of individuals: | 63 | is defined as the following set of individuals: |
65 | 64 | ||
66 | Andreas Dilger | 65 | Andreas Dilger |
67 | Dave Martindale | 66 | Dave Martindale |
68 | Guy Eric Schalnat | 67 | Guy Eric Schalnat |
69 | Paul Schmidt | 68 | Paul Schmidt |
70 | Tim Wegner | 69 | Tim Wegner |
71 | 70 | ||
72 | The PNG Reference Library is supplied "AS IS". The Contributing | 71 | The PNG Reference Library is supplied "AS IS". The Contributing Authors |
73 | Authors | ||
74 | and Group 42, Inc. disclaim all warranties, expressed or implied, | 72 | and Group 42, Inc. disclaim all warranties, expressed or implied, |
75 | including, without limitation, the warranties of merchantability and of | 73 | including, without limitation, the warranties of merchantability and of |
76 | fitness for any purpose. The Contributing Authors and Group 42, Inc. | 74 | fitness for any purpose. The Contributing Authors and Group 42, Inc. |
77 | assume no liability for direct, indirect, incidental, special, exemplary, | 75 | assume no liability for direct, indirect, incidental, special, exemplary, |
78 | or consequential damages, which may result from the use of the PNG | 76 | or consequential damages, which may result from the use of the PNG |
79 | Reference Library, even if advised of the possibility of such damage. | 77 | Reference Library, even if advised of the possibility of such damage. |
@@ -85,37 +83,30 @@ to the following restrictions: | |||
85 | 1. The origin of this source code must not be misrepresented. | 83 | 1. The origin of this source code must not be misrepresented. |
86 | 84 | ||
87 | 2. Altered versions must be plainly marked as such and must not | 85 | 2. Altered versions must be plainly marked as such and must not |
88 | be misrepresented as being the original source. | 86 | be misrepresented as being the original source. |
89 | 87 | ||
90 | 3. This Copyright notice may not be removed or altered from any | 88 | 3. This Copyright notice may not be removed or altered from any |
91 | source or altered source distribution. | 89 | source or altered source distribution. |
92 | 90 | ||
93 | The Contributing Authors and Group 42, Inc. specifically permit, without | 91 | The Contributing Authors and Group 42, Inc. specifically permit, without |
94 | fee, and encourage the use of this source code as a component to | 92 | fee, and encourage the use of this source code as a component to |
95 | supporting the PNG file format in commercial products. If you use this | 93 | supporting the PNG file format in commercial products. If you use this |
96 | source code in a product, acknowledgment is not required but would be | 94 | source code in a product, acknowledgment is not required but would be |
97 | appreciated. | 95 | appreciated. |
98 | 96 | ||
99 | 97 | ||
100 | A "png_get_copyright" function is available, for convenient use in | 98 | A "png_get_copyright" function is available, for convenient use in "about" |
101 | "about" | ||
102 | boxes and the like: | 99 | boxes and the like: |
103 | 100 | ||
104 | printf("%s",png_get_copyright(NULL)); | 101 | printf("%s",png_get_copyright(NULL)); |
105 | 102 | ||
106 | Also, the PNG logo (in PNG format, of course) is supplied in the | 103 | Also, the PNG logo (in PNG format, of course) is supplied in the |
107 | files "pngbar.png" and "pngbar.jpg (88x31) and | 104 | files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). |
108 | "pngnow.png" (98x31). | ||
109 | 105 | ||
110 | Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a | 106 | Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a |
111 | certification mark of the Open Source Initiative. | 107 | certification mark of the Open Source Initiative. |
112 | 108 | ||
113 | Glenn Randers-Pehrson | 109 | Glenn Randers-Pehrson |
114 | glennrp at users.sourceforge.net | 110 | glennrp at users.sourceforge.net |
115 | December 9, 2010 | 111 | December 9, 2010 |
116 | 112 | ||
117 | |||
118 | |||
119 | |||
120 | |||
121 | |||