more copyright updates

1 files changed, 40 insertions, 8 deletions

diff --git a/debian/copyright b/debian/copyright
index 6b1882a01..22e14474f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1756,7 +1756,7 @@ Files: src/libtncif/tncif.h
  src/libtncif/tncifimc.h
  src/libtncif/tncifimv.h
 Copyright: 2005-2011, Trusted Computing Group, Inc.
-License: BSD (3 clause)
+License: BSD-3-clause
 
 Files: src/libstrongswan/plugins/x509/x509_pkcs10.c
  src/pluto/pkcs7.c
@@ -1882,6 +1882,10 @@ Files: src/libfreeswan/pfkeyv2.h
  src/libhydra/plugins/kernel_klips/pfkeyv2.h
 Copyright: *No copyright*
 License: public-domain
+This file defines structures and symbols for the PF_KEY Version 2
+key management interface. It was written at the U.S. Naval Research
+Laboratory. This file is in the public domain. The authors ask that
+you leave this credit intact on any copies of this file.
 
 Files: src/libstrongswan/asn1/oid.c
  src/libstrongswan/asn1/oid.h
@@ -2188,22 +2192,50 @@ Copyright: 2006, Andreas Jellinghaus
   2006-2007, g10 Code GmbH
 License: MIT
 
-License: GPL-2
+License: GPL
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in
+ `/usr/share/common-licenses/GPL'.
+
+License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in
  `/usr/share/common-licenses/GPL-2'.
 
-License: GPL-3
+License: GPL-3+
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in
  `/usr/share/common-licenses/GPL-3'.
 
-License: LGPL-2
+License: LGPL-2+
  On Debian systems, the complete text of the Lesser GNU 
  General Public License version 2 can be found in 
  `/usr/share/common-licenses/LGPL-2'.
 
-License: BSD
- On Debian systems, the complete text of the BSD
- License can be found in
- `/usr/share/common-licenses/BSD'.
+License: BSD-3-clause
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  o Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  o 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.
+  o Neither the name of the Trusted Computing Group 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.