From 7cd2ac0e40d854bab9a32512018aff6172500c0e Mon Sep 17 00:00:00 2001 From: Beth Flanagan Date: Wed, 15 Jun 2011 13:52:23 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/files/common-licenses/Ruby | 82 ++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 43 deletions(-) (limited to 'meta/files/common-licenses/Ruby') diff --git a/meta/files/common-licenses/Ruby b/meta/files/common-licenses/Ruby index f380b56194..bc2e57f899 100644 --- a/meta/files/common-licenses/Ruby +++ b/meta/files/common-licenses/Ruby @@ -3,62 +3,58 @@ Ruby is copyrighted free software by Yukihiro Matsumoto . You can redistribute it and/or modify it under either the terms of the GPL (see COPYING.txt file), or the conditions below: -1. You may make and give away verbatim copies of the source form of the -software without restriction, provided that you duplicate all of the -original copyright notices and associated disclaimers. + 1. You may make and give away verbatim copies of the source form of the + software without restriction, provided that you duplicate all of the + original copyright notices and associated disclaimers. -2. You may modify your copy of the software in any way, provided that -you do at least ONE of the following: + 2. You may modify your copy of the software in any way, provided that + you do at least ONE of the following: -a) place your modifications in the Public Domain or otherwise -make them Freely Available, such as by posting said -modifications to Usenet or an equivalent medium, or by allowing -the author to include your modifications in the software. + a) place your modifications in the Public Domain or otherwise + make them Freely Available, such as by posting said + modifications to Usenet or an equivalent medium, or by allowing + the author to include your modifications in the software. -b) use the modified software only within your corporation or -organization. + b) use the modified software only within your corporation or + organization. -c) rename any non-standard executables so the names do not conflict -with standard executables, which must also be provided. + c) rename any non-standard executables so the names do not conflict + with standard executables, which must also be provided. -d) make other distribution arrangements with the author. + d) make other distribution arrangements with the author. -3. You may distribute the software in object code or executable -form, provided that you do at least ONE of the following: + 3. You may distribute the software in object code or executable + form, provided that you do at least ONE of the following: -a) distribute the executables and library files of the software, -together with instructions (in the manual page or equivalent) -on where to get the original distribution. + a) distribute the executables and library files of the software, + together with instructions (in the manual page or equivalent) + on where to get the original distribution. -b) accompany the distribution with the machine-readable source of -the software. + b) accompany the distribution with the machine-readable source of + the software. -c) give non-standard executables non-standard names, with -instructions on where to get the original software distribution. + c) give non-standard executables non-standard names, with + instructions on where to get the original software distribution. -d) make other distribution arrangements with the author. - -4. You may modify and include the part of the software into any other -software (possibly commercial). But some files in the distribution -are not written by the author, so that they are not under this terms. - -They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some -files under the ./missing directory. See each file for the copying -condition. - -5. The scripts and library files supplied as input to or produced as -output from the software do not automatically fall under the -copyright of the software, but belong to whomever generated them, -and may be sold commercially, and may be aggregated with this -software. - -6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. + d) make other distribution arrangements with the author. + 4. You may modify and include the part of the software into any other + software (possibly commercial). But some files in the distribution + are not written by the author, so that they are not under this terms. + They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some + files under the ./missing directory. See each file for the copying + condition. + 5. The scripts and library files supplied as input to or produced as + output from the software do not automatically fall under the + copyright of the software, but belong to whomever generated them, + and may be sold commercially, and may be aggregated with this + software. + 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. -- cgit v1.2.3-54-g00ecf