* Update debian/copyright using the information from LICENSE.

2 files changed, 158 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index aef6599..3709457 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ wallet (0.4-1) unstable; urgency=low
     - Add the netdb-root ACL verifier, which requires root instances.
     - Determine object and ACL scheme classes from the database.
     - Coding style fixes and cleanup.
+  * Update debian/copyright using the information from LICENSE.
 
- -- Russ Allbery <rra@debian.org>  Wed, 05 Dec 2007 16:16:23 -0800
+ -- Russ Allbery <rra@debian.org>  Wed, 05 Dec 2007 16:17:26 -0800
 
 wallet (0.3-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index d426f23..4f7d253 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,20 +18,159 @@ Debian packaging copyright:
 
 Copyright:
 
-    Copyright 1994, 1998, 1999, 2000, 2006, 2007 Board of Trustees, Leland
-    Stanford Jr. University.  All rights reserved.
-  
-    Permission to use, copy, modify, and distribute this software and its
-    documentation for any purpose and without fee is hereby granted,
-    provided that the above copyright notice appear in all copies and that
-    both that copyright notice and this permission notice appear in
-    supporting documentation, and that the name of Stanford University not
-    be used in advertising or publicity pertaining to distribution of the
-    software without specific, written prior permission.  Stanford
-    University makes no representations about the suitability of this
-    software for any purpose.  It is provided "as is" without express or
-    implied warranty.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+The wallet package as a whole is:
+
+  Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University.
+  All rights reserved.
+
+and covered under the following license:
+
+  Permission to use, copy, modify, and distribute this software and its
+  documentation for any purpose and without fee is hereby granted,
+  provided that the above copyright notice appear in all copies and that
+  both that copyright notice and this permission notice appear in
+  supporting documentation, and that the name of Stanford University not
+  be used in advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.  Stanford
+  University makes no representations about the suitability of this
+  software for any purpose.  It is provided "as is" without express or
+  implied warranty.
+
+  THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+All individual files with no other license statement are covered under
+this license.  Some files have additional copyright dates from earlier
+releases or may be owned by other copyright holders as noted in those
+files.
+
+Collected copyright notices for the entire package:
+
+  Copyright 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007
+      Board of Trustees, Leland Stanford Jr. University.
+  Copyright 2000, 2001, 2004 Russ Allbery <rra@stanford.edu>
+  Copyright 2004, 2005, 2006
+      by Internet Systems Consortium, Inc. ("ISC")
+  Copyright 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+      2002, 2003 by The Internet Software Consortium and Rich Salz
+  Copyright 1995 Patrick Powell
+  Copyright 1996, 1997 Brandon Long <blong@fiction.net>
+  Copyright 1998 Thomas Roessler <roessler@guug.de>
+  Copyright 1998 Michael Elkins <me@cs.hmc.edu>
+  Copyright 1998 Andrew Tridgell <tridge@samba.org>
+  Copyright 2000, 2005 Hrvoje Niksic <hniksic@xemacs.org>
+  Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+      2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+  Copyright 1994 X Consortium
+
+The file portable/snprintf.c is covered by the following license:
+
+  This code is based on code written by Patrick Powell (papowell@astart.com)
+  It may be used for any purpose as long as this notice remains intact
+  on all source code distributions
+
+The files portable/asprintf.c, portable/dummy.c and util/concat.c have
+been placed in the public domain by their author.
+
+The files tests/libtest.c, tests/libtest.h, tests/portable/snprintf-t.c,
+tests/util/concat-t.c, tests/util/messages-t.c, tests/util/xmalloc-t,
+and tests/util/xmalloc.c are covered by the following copyright and
+license:
+
+  Copyright (c) 2004, 2005, 2006
+      by Internet Systems Consortium, Inc. ("ISC")
+  Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+      2002, 2003 by The Internet Software Consortium and Rich Salz
+
+  This code is derived from software contributed to the Internet Software
+  Consortium by Rich Salz.
+
+  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 ISC DISCLAIMS ALL WARRANTIES WITH
+  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC 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.
+
+The files Makefile.in and aclocal.m4 are generated by GNU Automake and
+covered by the following copyright and license:
+
+  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+  2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+  This file is free software; the Free Software Foundation
+  gives unlimited permission to copy and/or distribute it,
+  with or without modifications, as long as this notice is preserved.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.
+
+The file configure is generated by GNU Autoconf and is covered by the
+following copyright and license:
+
+  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+  2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+  This configure script is free software; the Free Software Foundation
+  gives unlimited permission to copy, distribute and modify it.
+
+The files build-aux/compile, build-aux/depcomp, and build-aux/missing are
+taken from GNU Automake and are covered by the following copyright and
+license:
+
+  Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+    Free Software Foundation, Inc.
+
+  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, or (at your option) any
+  later version.
+
+  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.
+
+  As a special exception to the GNU General Public License, if you
+  distribute this file as part of a program that contains a configuration
+  script generated by Autoconf, you may include it under the same
+  distribution terms that you use for the rest of that program.
+
+For the wallet distribution, the option described in the last paragraph
+has been accepted and these files are distributed under the same terms as
+the wallet package as a whole, as described at the top of this file.
+
+The file build-aux/install-sh is covered by the following copyright and
+license:
+
+  Copyright (C) 1994 X Consortium
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+
+  Except as contained in this notice, the name of the X Consortium shall
+  not be used in advertising or otherwise to promote the sale, use or
+  other dealings in this Software without prior written authorization
+  from the X Consortium.