From e47343d12ee571281238bbf5663b074c0e32049f 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. Signed-off-by: Beth Flanagan --- meta/files/common-licenses/BSD-4-Clause | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'meta/files/common-licenses/BSD-4-Clause') diff --git a/meta/files/common-licenses/BSD-4-Clause b/meta/files/common-licenses/BSD-4-Clause index c5471a3fc..7b162dec0 100644 --- a/meta/files/common-licenses/BSD-4-Clause +++ b/meta/files/common-licenses/BSD-4-Clause @@ -5,18 +5,18 @@ All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. + notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. 3. All advertising materials mentioning features or use of this software -must display the following acknowledgement: -This product includes software developed by the . + must display the following acknowledgement: + This product includes software developed by the . 4. Neither the name of the nor the -names of its contributors may be used to endorse or promote products -derived from this software without specific prior written permission. + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY ''AS IS'' AND ANY +THIS SOFTWARE IS PROVIDED BY ``AS IS`` AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY @@ -26,3 +26,4 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + -- cgit v1.2.3