Note that the protocol doc rfc5864.txt is dual-licensed

diff --git a/debian/changelog b/debian/changelog
index a1f093799e6dfc14023686f93dede6a0b80c6c4d..59a6da56b8a89328d497a729fcf768f2b12b4be2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ openafs (1.6.14-1) UNRELEASED; urgency=medium
       accidentally disabled as part of the fix for OPENAFS-SA-2015-006
   * Update Swedish translation, thanks Martin Bagge and Anders Jonsson.
     (Closes: #781678)
+  * Note that the protocol document rfc5864.txt is dual licensed.
+    (Closes: #768385)
 
  -- Benjamin Kaduk <kaduk@mit.edu>  Mon, 17 Aug 2015 11:19:55 -0400
 

diff --git a/debian/copyright b/debian/copyright
index 402a9da5c04e379ea282a42d64a66a2436e2c31b..e6165ee9d04bb1ce39f596103c25b10eed962b80 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -431,3 +431,34 @@ to the following license:
    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.
+
+doc/protocol/rfc5864.txt is dual-licensed under the following two licenses:
+   Copyright 2009, 2010 Russ Allbery <rra@stanford.edu>
+   Copyright 2010 IETF Trust
+
+   Permission to use, copy, modify, and distribute this document 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 its authors not be used in advertising or
+   publicity pertaining to distribution of this document without specific,
+   written prior permission.  Its authors make no representations about
+   the suitability of this document for any purpose.  It is provided "as
+   is" without express or implied warranty.
+
+   THIS DOCUMENT 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.
+and
+   Copyright (c) 2010 IETF Trust and the persons identified as the
+   document authors.  All rights reserved.
+
+   This document is subject to BCP 78 and the IETF Trust's Legal
+   Provisions Relating to IETF Documents
+   (http://trustee.ietf.org/license-info) in effect on the date of
+   publication of this document.  Please review these documents
+   carefully, as they describe your rights and restrictions with respect
+   to this document.  Code Components extracted from this document must
+   include Simplified BSD License text as described in Section 4.e of
+   the Trust Legal Provisions and are provided without warranty as
+   described in the Simplified BSD License.