Explicitly include BSD licenses into debian/copyright

Instead of referencing generic and non-matching file from
common-licenses.

2 files changed, 47 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 2833835..b2dc610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ inetutils (2:1.8-1) UNRELEASED; urgency=low
   * Remove Marcus Brinkmann and Jeff Bailey from Uploaders field, thanks for
     your previous work! (Closes: #503567)
   * Switch Vcs fields to the new git repositories.
+  * Explicitly include BSD licenses into debian/copyright, instead of
+    referencing generic and non-matching file from common-licenses.
 
  -- Guillem Jover <guillem@debian.org>  Tue, 08 Jun 2010 21:16:04 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 807a3b8..40387b0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -70,9 +70,52 @@ The source code is covered by the following copyrights and licenses:
 * Most source files:
 
     Copyright © 1985-1988, 1990, 2000 Massachusetts Institute of Technology.
+
+  under the following license:
+
+    Export of this software from the United States of America is assumed
+    to require a specific license from the United States Government.
+    It is the responsibility of any person or organization contemplating
+    export to obtain such a license before exporting.
+
+    WITHIN THAT CONSTRAINT, 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 M.I.T. not be used in advertising or publicity pertaining
+    to distribution of the software without specific, written prior
+    permission.  M.I.T. makes no representations about the suitability of
+    this software for any purpose.  It is provided "as is" without express
+    or implied warranty.
+
+* Most source files:
+
     Copyright © 1983-1985, 1988-1994, 1996, 2000, 2002
               The Regents of the University of California.
 
-  under the BSD license. On Debian systems, the complete text of the BSD
-  license can be found in '/usr/share/common-licenses/BSD'.
+  under the following license:
 
+    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.