Follow extensible exceptions changes

[haskell-directory.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index 19f2d11..06bb641 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-This library (libraries/base) is derived from code from several
+This library (libraries/base) is derived from code from two

 sources: 
 
   * Code from the GHC project which is largely (c) The University of
 sources: 
 
   * Code from the GHC project which is largely (c) The University of

@@ -8,21 +8,14 @@ sources:
     and freely redistributable (but see the full license for
     restrictions).
 
     and freely redistributable (but see the full license for
     restrictions).
 

-  * Code from the Haskell Foreign Function Interface specification,
-    which is (c) Manuel M. T. Chakravarty and freely redistributable
-    (but see the full license for restrictions).
-
-  * Code from the Parsec library which is (c) Daan Leijen, and
-    distributable under a BSD-style license (see below).
-
-The full text of these licenses is reproduced below.  All of the
+The full text of these licenses is reproduced below.  Both of the

 licenses are BSD-style or compatible.
 
 -----------------------------------------------------------------------------
 
 The Glasgow Haskell Compiler License
 
 licenses are BSD-style or compatible.
 
 -----------------------------------------------------------------------------
 
 The Glasgow Haskell Compiler License
 

-Copyright 2002, The University Court of the University of Glasgow. 
+Copyright 2004, The University Court of the University of Glasgow. 

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

@@ -68,46 +61,3 @@ Haskell 98", is distributed under the following license:
   be a definition of the Haskell 98 Language.
 
 -----------------------------------------------------------------------------
   be a definition of the Haskell 98 Language.
 
 -----------------------------------------------------------------------------

-
-Code derived from the document "The Haskell 98 Foreign Function
-Interface, An Addendum to the Haskell 98 Report" is distributed under
-the following license:
-
-  Copyright (c) 2002 Manuel M. T. Chakravarty
-
-  The authors intend this Report to belong to the entire Haskell
-  community, and so we grant permission to copy and distribute it for
-  any purpose, provided that it is reproduced in its entirety,
-  including this Notice.  Modified versions of this Report may also be
-  copied and distributed for any purpose, provided that the modified
-  version is clearly presented as such, and that it does not claim to
-  be a definition of the Haskell 98 Foreign Function Interface.
-
------------------------------------------------------------------------------
-
-Code derived from Daan Leijen's Parsec is distributed under the following
-license:
-
-  Copyright 1999-2000, Daan Leijen. All rights reserved.
-
-  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.
-
-This software is provided by the copyright holders "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 copyright holders 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.
-
------------------------------------------------------------------------------