merge conflicts in AUTHORS and COPYING

20061212141004-418b8-b65979ae7f18c1cbd7db328a4a1f7d48f0f61825.gz

2 files changed, 77 insertions, 1 deletions

diff --git a/AUTHORS b/AUTHORS
index 05105c082..cc19352d3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,3 +2,11 @@ Robert McQueen <robert.mcqueen@collabora.co.uk>
 Rob Taylor <rob.taylor@collabora.co.uk>
 Ole André <ole.andre.ravnaas@collabora.co.uk>
 Ross Burton <ross@burtonini.com>
+Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+The Gabble source distribution includes the following third-party code:
+
+* src/libmd5-rfc by L. Peter Deutsch <ghost@aladdin.com>, taken from
+  <http://sourceforge.net/projects/libmd5-rfc/>
+* src/sha1 by Allan Saddi <allan@saddi.com>, taken from
+  sha v1.0.4 <http://sourceforge.net/projects/sha/>
diff --git a/COPYING b/COPYING
index 2d2d780e6..23b42419c 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,16 @@
+Most of Gabble is licensed under the GNU Lesser General Public License,
+as published by the Free Software Foundation and reproduced below:
+either version 2.1 of the License, or (at your option) any later version.
+
+Gabble incorporates the libmd5-rfc MD5 implementation by L. Peter Deutsch
+(in the directory src/libmd5-rfc). This is released under a BSD-style
+license also reproduced below.
+
+Gabble incorporates a SHA1 implementation by Allan Saddi, taken from
+sha v1.0.4 (in the directory src/sha). This is released under a BSD-style
+license also reproduced below.
+
+------------------------------------------------------------------------
 
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
@@ -507,4 +520,59 @@ if necessary.  Here is a sample; alter the names:
 
 That's all there is to it!
 
-
+------------------------------------------------------------------------
+
+License of src/libmd5-rfc:
+
+  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+------------------------------------------------------------------------
+
+License of src/sha1:
+
+/*-
+ * Copyright (c) 2001-2003 Allan Saddi <allan@saddi.com>
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ALLAN SADDI AND HIS 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 ALLAN SADDI OR HIS 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.
+ *
+ * $Id: sha1.h 347 2003-02-23 22:11:49Z asaddi $
+ */