r2279 - / trunk/bootscripts

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Aug 27 21:25:18 PDT 2006


Author: jim
Date: 2006-08-27 22:25:17 -0600 (Sun, 27 Aug 2006)
New Revision: 2279

Modified:
   /
   trunk/bootscripts/
   trunk/bootscripts/LICENSE
Log:
 r5256 at server (orig r2412):  jim | 2006-08-27 21:02:42 -0700
  r5239 at server:  jim | 2006-08-24 21:43:13 -0700
  Updated license
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2411
   + b6734a72-470d-0410-b049-f317dca95413:/:2412


Property changes on: trunk/bootscripts
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/bootscripts:4937
3949c430-d905-0410-97b6-f115d20341b5:/bootscripts:1331
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/bootscripts:1109
   + 38c7b366-470d-0410-a457-935707c16d9b:/bootscripts:5239
3949c430-d905-0410-97b6-f115d20341b5:/bootscripts:1331
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/bootscripts:1109

Modified: trunk/bootscripts/LICENSE
===================================================================
--- trunk/bootscripts/LICENSE	2006-08-26 19:48:31 UTC (rev 2278)
+++ trunk/bootscripts/LICENSE	2006-08-28 04:25:17 UTC (rev 2279)
@@ -1,29 +1,22 @@
-Copyright (c) 1999-2002, Gerard Beekmans
+Copyright (c) 2006 Jim Gifford and Ryan Oliver
 
-All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-	*	Redistributions in any form must retain the above copyright notice,
-		this list of conditions and the following disclaimer.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
-	*	Neither the name of "Linux From Scratch" nor the names of its
-		contributors may be used to endorse or promote products derived from
-		this material without specific prior written permission.
-
-	*	Any material derived from Linux From Scratch must contain a
-		reference to the "Linux From Scratch" project.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``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 THE REGENTS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; 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.
-




More information about the cross-lfs mailing list