[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit a982e74d766ff93ac0d1b347c442b90a1f4d0448
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sat Dec 4 03:41:57 2004 +0100

    Preparing to import Inflate
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-14)

diff --git a/3rd-party-licenses/BSD b/3rd-party-licenses/BSD
new file mode 100644
index 0000000..c01b032
--- /dev/null
+++ b/3rd-party-licenses/BSD
@@ -0,0 +1,29 @@
+Copyright (c) The Regents of the University of California.
+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.
+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.
+3. Neither the name of the University nor the 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 THE REGENTS 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.
+
+# arch-tag: 3-clause BSD license text
+
diff --git a/COPYRIGHT b/COPYRIGHT
index 4847ab9..32ff67f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -103,5 +103,28 @@ at 3rd-party-licenses/LGPL-2.1 in the source distribution.
 Pursuant to the terms of the LGPL, you may consider this code to fall
 under the GPL as part of the whole MissingH work.
 
+----------------------------------------------------
+MissingH.Checksum.CRC32 is
+(C) 2002 HardCore SoftWare, Doug Hoyte
+and is "distributed under the terms of the GNU GPL."  This license is
+the same as the main license for MissingH.
+
+The code was obtained from 
+http://cvs.sourceforge.net/viewcvs.py/haskell-libs/libs/crypto/crc32.hs
+
+----------------------------------------------------
+MissingH.Compression.Inflate is
+Copyright 2004 Ian Lynagh <igloo at earth.li>
+Licence: 3 clause BSD.
+
+Debian GNU/Linux users may find the 3-clause BSD license at
+/usr/share/common-licenses/BSD.  Alternatively, you may find it at
+3rd-party-licenses/BSD.  Please note that the University of California
+has no claim on this code; simply substitute Ian Lynagh for the
+University wherever it may occur in that file.
+
+The code was obtained from
+http://urchin.earth.li/darcs/ian/inflate/Inflate.lhs
+
 ------------------------------------------------------------------
 arch-tag: copyright statement
diff --git a/ChangeLog b/ChangeLog
index fcc3df6..451a392 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,26 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2004-12-03 20:41:57 GMT	John Goerzen <jgoerzen at complete.org>	patch-14
+
+    Summary:
+      Preparing to import Inflate
+    Revision:
+      missingh--head--0.7--patch-14
+
+
+    new files:
+     3rd-party-licenses/BSD
+     libsrc/MissingH/Compression/.arch-ids/=id
+
+    modified files:
+     COPYRIGHT ChangeLog
+
+    new directories:
+     libsrc/MissingH/Compression
+     libsrc/MissingH/Compression/.arch-ids
+
+
 2004-12-03 20:32:24 GMT	John Goerzen <jgoerzen at complete.org>	patch-13
 
     Summary:

-- 
haskell-testpack