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

Fri Apr 23 14:44:53 UTC 2010

The following commit has been merged in the master branch:
commit 004d98bdcb1dc33092e4354714492891e68f9ff7
Author: John Goerzen <jgoerzen at complete.org>
Date:   Wed Oct 20 08:42:38 2004 +0100

    Noted new info in COPYRIGHT
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--1.0--patch-81)

diff --git a/COPYRIGHT b/COPYRIGHT
index 6ce3d1f..7fc8034 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -24,7 +24,10 @@ If the GPL is unacceptable for your uses, please e-mail me; alternative
 terms can be negotiated for your project.
 
 ----------------------------------------------------
-The MissingH.Hsemail modules are:
+The MissingH.Hsemail modules come from hsemail 2004-10-12 from 
+http://cryp.to/hsemail/.
+
+Copyright/License:
 
   Copyright (c) 2004 Peter Simons <simons at cryp.to>. All rights reserved. This
   software is released under the terms of the GNU General Public License.
@@ -37,4 +40,43 @@ I (John Goerzen) have made these modifications:
  * Some files from the source distribution are not relevant to MissingH
    and were removed.
 
+----------------------------------------------------
+The Wash modules come from WashNGo 2.0.5.  Mail is version 0.3.7.  Utility
+is version 0.3.11.   They are available from
+http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/.
+
+Copyright/License for all Wash modules:
+
+  The WASH License
+
+  Copyright 2001-2003, Peter Thiemann.
+  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. The name of the author may not be used to endorse or promote
+      products derived from this software without specific prior
+      written permission. 
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: copyright statement
diff --git a/ChangeLog b/ChangeLog
index 38d846b..1302249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--1.0
 #
 
+2004-10-20 02:42:38 GMT	John Goerzen <jgoerzen at complete.org>	patch-81
+
+    Summary:
+      Noted new info in COPYRIGHT
+    Revision:
+      missingh--head--1.0--patch-81
+
+
+    modified files:
+     COPYRIGHT ChangeLog debian/copyright
+
+
 2004-10-20 02:38:42 GMT	John Goerzen <jgoerzen at complete.org>	patch-80
 
     Summary:
diff --git a/debian/copyright b/debian/copyright
index 261314a..7fc8034 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,82 @@
-This package was debianized by John Goerzen <jgoerzen at complete.org> on
-Tue,  5 Oct 2004 16:17:09 -0500.
+MissingH: Haskell libraries
+Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
 
-It was downloaded from gopher://quux.org/1/devel/missingh or
-http://quux.org/devel/missingh
+All code is under the following license unless otherwise noted:
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-Copyright:
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-Upstream Author(s): John Goerzen <jgoerzen at complete.org>
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
-License:
+The GNU General Public License is available in the file COPYING in the source
+distribution.  Debian GNU/Linux users may find this in
+/usr/share/common-licenses/GPL-2.
 
-Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
+If the GPL is unacceptable for your uses, please e-mail me; alternative
+terms can be negotiated for your project.
+
+----------------------------------------------------
+The MissingH.Hsemail modules come from hsemail 2004-10-12 from 
+http://cryp.to/hsemail/.
+
+Copyright/License:
+
+  Copyright (c) 2004 Peter Simons <simons at cryp.to>. All rights reserved. This
+  software is released under the terms of the GNU General Public License.
+
+I (John Goerzen) have made these modifications:
+
+ * Module names adjusted to work with MissingH, and to not conflict
+   with user-installed copies of hsemail
+
+ * Some files from the source distribution are not relevant to MissingH
+   and were removed.
+
+----------------------------------------------------
+The Wash modules come from WashNGo 2.0.5.  Mail is version 0.3.7.  Utility
+is version 0.3.11.   They are available from
+http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/.
+
+Copyright/License for all Wash modules:
+
+  The WASH License
+
+  Copyright 2001-2003, Peter Thiemann.
+  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. The name of the author may not be used to endorse or promote
+      products derived from this software without specific prior
+      written permission. 
 
-This program is licensed under the GNU General Public License.
-Debian GNU/Linux users can find the GNU GPL at
-/usr/share/common-licenses/GPL.
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: copyright statement

-- 
haskell-testpack

