summaryrefslogtreecommitdiffstats
path: root/meta/files/common-licenses/WXwindows
diff options
context:
space:
mode:
authorBeth Flanagan <elizabeth.flanagan@intel.com>2011-06-15 13:52:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 23:44:49 +0100
commit7cd2ac0e40d854bab9a32512018aff6172500c0e (patch)
tree99366a7b07db9f0b53bb9d411f0016f36982616d /meta/files/common-licenses/WXwindows
parent879a7f819b7f38cda82d97489af433310aabfed1 (diff)
downloadpoky-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/WXwindows')
-rw-r--r--meta/files/common-licenses/WXwindows106
1 files changed, 51 insertions, 55 deletions
diff --git a/meta/files/common-licenses/WXwindows b/meta/files/common-licenses/WXwindows
index fe77cafe56..1fe09482dc 100644
--- a/meta/files/common-licenses/WXwindows
+++ b/meta/files/common-licenses/WXwindows
@@ -1,59 +1,55 @@
1 1
2wxWindows Library Licence, Version 3.1 2 wxWindows Library Licence, Version 3.1
3====================================== 3 ======================================
4 4
5Copyright (C) 1998-2005 Julian Smart, Robert Roebling et al 5 Copyright (C) 1998-2005 Julian Smart, Robert Roebling et al
6 6
7Everyone is permitted to copy and distribute verbatim copies 7 Everyone is permitted to copy and distribute verbatim copies
8of this licence document, but changing it is not allowed. 8 of this licence document, but changing it is not allowed.
9 9
10WXWINDOWS LIBRARY LICENCE 10 WXWINDOWS LIBRARY LICENCE
11TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 11 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
12 12
13This library is free software; you can redistribute it and/or modify it 13 This library is free software; you can redistribute it and/or modify it
14under the terms of the GNU Library General Public Licence as published by 14 under the terms of the GNU Library General Public Licence as published by
15the Free Software Foundation; either version 2 of the Licence, or (at 15 the Free Software Foundation; either version 2 of the Licence, or (at
16your option) any later version. 16 your option) any later version.
17 17
18This library is distributed in the hope that it will be useful, but 18 This library is distributed in the hope that it will be useful, but
19WITHOUT ANY WARRANTY; without even the implied warranty of 19 WITHOUT ANY WARRANTY; without even the implied warranty of
20MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library 20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library
21General Public Licence for more details. 21 General Public Licence for more details.
22 22
23You should have received a copy of the GNU Library General Public Licence 23 You should have received a copy of the GNU Library General Public Licence
24along with this software, usually in a file named COPYING.LIB. If not, 24 along with this software, usually in a file named COPYING.LIB. If not,
25write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, 25 write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
26Boston, MA 02111-1307 USA. 26 Boston, MA 02111-1307 USA.
27 27
28EXCEPTION NOTICE 28 EXCEPTION NOTICE
29 29
301. As a special exception, the copyright holders of this library give 30 1. As a special exception, the copyright holders of this library give
31permission for additional uses of the text contained in this release of 31 permission for additional uses of the text contained in this release of
32the library as licenced under the wxWindows Library Licence, applying 32 the library as licenced under the wxWindows Library Licence, applying
33either version 3.1 of the Licence, or (at your option) any later version of 33 either version 3.1 of the Licence, or (at your option) any later version of
34the Licence as published by the copyright holders of version 34 the Licence as published by the copyright holders of version
353.1 of the Licence document. 35 3.1 of the Licence document.
36 36
372. The exception is that you may use, copy, link, modify and distribute 37 2. The exception is that you may use, copy, link, modify and distribute
38under your own terms, binary object code versions of works based 38 under your own terms, binary object code versions of works based
39on the Library. 39 on the Library.
40 40
413. If you copy code from files distributed under the terms of the GNU 41 3. If you copy code from files distributed under the terms of the GNU
42General Public Licence or the GNU Library General Public Licence into a 42 General Public Licence or the GNU Library General Public Licence into a
43copy of this library, as this licence permits, the exception does not 43 copy of this library, as this licence permits, the exception does not
44apply to the code that you add in this way. To avoid misleading anyone as 44 apply to the code that you add in this way. To avoid misleading anyone as
45to the status of such modified files, you must delete this exception 45 to the status of such modified files, you must delete this exception
46notice from such code and/or adjust the licensing conditions notice 46 notice from such code and/or adjust the licensing conditions notice
47accordingly. 47 accordingly.
48 48
494. If you write modifications of your own for this library, it is your 49 4. If you write modifications of your own for this library, it is your
50choice whether to permit this exception to apply to your modifications. 50 choice whether to permit this exception to apply to your modifications.
51If you do not wish that, you must delete the exception notice from such 51 If you do not wish that, you must delete the exception notice from such
52code and/or adjust the licensing conditions notice accordingly. 52 code and/or adjust the licensing conditions notice accordingly.
53
54
55
56
57 53
58 54
59 55