Update the upstream copyright notices in the copyright file.

diff --git a/changelog b/changelog
index d8c946e11b789697a4597ecf0b481b892623a582..d15cb0d195d392cc9c2fa3f95c75d8faba886e65 100644 (file)
--- a/changelog
+++ b/changelog
@@ -31,8 +31,10 @@ dma (0.0.2010.06.17-1) UNRELEASED; urgency=low
     - teach the dbounce-simple-safecat handler about the M*/Q* spool
       files scheme
   * Bump Standards-Version to 3.8.4 with no changes.
-  * Bring the copyright file up to the latest revision of the DEP 5
-    proposed format and bump the year on my copyright notice.
+  * Update the copyright file:
+    - bring it up to the latest revision of the DEP 5
+    - update the upstream copyright notices
+    - bump the year on my copyright notice
   * Remove the diffsrc rules target which was intended for my own
     internal use, but has outlived its time.
   * Use dpkg-buildflags from dpkg-dev >= 1.15.7~ to get the default

diff --git a/copyright b/copyright
index 82c64d9cfe1a6ff46b01a469488e7a469ff3c874..e19f966794c73c12f469eb8b236b7931ffa878f6 100644 (file)
--- a/copyright
+++ b/copyright
@@ -2,7 +2,6 @@ Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep6.mdwn?op=file&
 Name: dma
 
 Files: base64.c
-Copyright: Copyright (c) 2008 The DragonFly Project.  All rights reserved.
 Copyright: Copyright (c) 1995-2001 Kungliga Tekniska Högskolan
  (Royal Institute of Technology, Stockholm, Sweden).
  All rights reserved.
@@ -15,7 +14,16 @@ Copyright: Copyright (c) 2008 The DragonFly Project.  All rights reserved.
   Germany.
 License: BSD-3
 
-Files: dma.c
+Files: dfcompat.c
+Copyright: Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ Copyright (c) 1998, M. Warner Losh <imp@freebsd.org>  All rights reserved.
+License: BSD-1 BSD-2
+
+Files: dma.8
+Copyright: Copyright (c) 2008 The DragonFly Project.  All rights reserved.
+License: BSD-3
+
+Files: dma.c dns.c mail.c spool.c util.c
 Copyright: Copyright (c) 2008 The DragonFly Project.  All rights reserved.
   This code is derived from software contributed to The DragonFly Project
   by Simon 'corecode' Schubert <corecode@fs.ei.tum.de>.
@@ -46,3 +54,38 @@ License: BSD-3
   3. Neither the name of The DragonFly Project nor the names of its
      contributors may be used to endorse or promote products derived
      from this software without specific, prior written permission.
+
+License: BSD-1
+  Permission to use, copy, modify, and distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+License: BSD-2
+  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 THE AUTHOR 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 AUTHOR 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.