2002-02-04 Jeff Johnston <jjohnstn@redhat.com>

        * COPYING.NEWLIB: Remove advertising clause from
        Berkeley and Red Hat licenses.

diff --git a/COPYING.NEWLIB b/COPYING.NEWLIB
index a75c0c7a877991e6a87adbdc7241062d5599d859..6174ea37d28a24767e5af7ce2fbaba67ec54953f 100644 (file)
--- a/COPYING.NEWLIB
+++ b/COPYING.NEWLIB
@@ -9,8 +9,8 @@ All rights reserved.
 Redistribution and use in source and binary forms are permitted
 provided that the above copyright notice and this paragraph are
 duplicated in all such forms and that any documentation,
-advertising materials, and other materials related to such
-distribution and use acknowledge that the software was developed
+and other materials related to such distribution and use 
+acknowledge that the software was developed
 by the University of California, Berkeley.  The name of the
 University may not be used to endorse or promote products derived
 from this software without specific prior written permission.
@@ -131,14 +131,27 @@ files in the newlib subdirectory are governed by the following copyright.
 Copyright (c) 1994, 1997, 2001, 2002 Red Hat Incorporated.
 All rights reserved.
 
-Redistribution and use in source and binary forms are permitted
-provided that the above copyright notice and this paragraph are
-duplicated in all such forms and that any documentation,
-advertising materials, and other materials related to such
-distribution and use acknowledge that the software was developed
-at Red Hat Incorporated.  Red Hat Incorporated may not be used to
-endorse or promote products derived from this software without
-specific prior written permission.
-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.
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met: 
+
+    Redistributions of source code must retain the above copyright 
+    notice, this list of conditions and the following disclaimer.
+
+    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.
+
+    The name of Red Hat Incorporated may not be used to endorse 
+    or promote products derived from this software without specific 
+    prior written permission.
+
+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 RED HAT INCORPORATED 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. 

diff --git a/ChangeLog b/ChangeLog
index 9bd2e2a033da9c0b38342e8a13620b3adcc31891..ce8a9665e8a8b2457b84a842e15911d058ac872b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * COPYING.NEWLIB: Remove advertising clause from
+        Berkeley and Red Hat licenses.
+
 2002-02-01  Mo DeJong  <supermo@bayarea.net>
 
        * Makefile.in: Add all-tix to deps for all-snavigator