Add Jason Edgecomb's copyright and license for man pages

diff --git a/debian/changelog b/debian/changelog
index 2906b284feed9085594e19733a08a0bab9e03fc2..5a642ff9f3da2c7d87568ac611674fe4a2f2985f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ openafs (1.4.7.dfsg1-5) unstable; urgency=low
     and builds without UCONTEXT fail.  The binaries we were building
     before didn't work and no one reported a bug, indicating no one was
     attempting to use OpenAFS on hppa.
+  * Add Jason Edgecomb's copyright and license for man pages to
+    debian/copyright.
 
  -- Russ Allbery <rra@debian.org>  Fri, 18 Jul 2008 20:34:04 -0700
 

diff --git a/debian/copyright b/debian/copyright
index ee56891f4350fcbbec3fc951f7f7034ef8fa0817..64c587b36a97f1b5187c926dd4213af1817da0e4 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -397,3 +397,39 @@ license:
 
 src/afs/LINUX/osi_flush.s included code under IBM Public License with
 permission of the author, Paul MacKerras.
+
+Personal contributions made by Jason Edgecombe
+<jason@rampaginggeek.com> that refer to the "BSD license" are subject
+to the following license:
+
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are
+   met:
+
+       * Redistributions of source code must retain the above
+         copyright notice, this list of conditions and the following
+         disclaimer.
+       
+       * 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.
+
+       * Neither the name of OpenAFS 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 COPYRIGHT HOLDERS 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 COPYRIGHT
+   OWNER 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.