Prepare for 2.4.0.

[cascardo/ovs.git] / debian / copyright.in

diff --git a/debian/copyright.in b/debian/copyright.in
index af6c586..a9aaa5b 100644 (file)
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -15,6 +15,12 @@ Upstream Copyright Holders:
        Copyright (c) 2011 Gaetano Catalli
        Copyright (C) 2000-2003 Geoffrey Wossum (gwossum@acm.org)
        Copyright (C) 2000 The NetBSD Foundation, Inc.
+       Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+       Copyright (c) 1982, 1986, 1990, 1993 The Regents of the University of California.
+       Copyright (c) 2008, 2012 Vincent Bernat <bernat@luffy.cx>
+       Copyright (c) 2014 Michael Chapman
+       Copyright (c) 2014 WindRiver, Inc.
+       Copyright (c) 2014 Avaya, Inc.
 
 License:
 
@@ -84,10 +90,16 @@ License:
        lib/getopt_long.c
        include/windows/getopt.h
 
+* The following files are licensed under the 3-clause BSD-license
+
+       include/windows/netinet/icmp6.h
+       include/windows/netinet/ip6.h
+       lib/strsep.c
+
 * The following components are dual-licensed under the
   GNU General Public License version 2 and the Apache License Version 2.0.
 
-       include/linux/openvswitch.h
+       datapath/linux/compat/include/linux/openvswitch.h
 
   On Debian systems, the complete text of the GNU General Public License
   version 2 can be found in `/usr/share/common-licenses/GPL-2'.
@@ -196,6 +208,17 @@ License:
     gives unlimited permission to copy and/or distribute it,
     with or without modifications, as long as this notice is preserved.
 
+* The following files are licensed under the ISC-license
+
+    lib/lldp/aa-structs.h
+    lib/lldp/lldpd.c
+    lib/lldp/lldpd.h
+    lib/lldp/lldpd-structs.c
+    lib/lldp/lldpd-structs.h
+    lib/lldp/lldp.c
+    lib/lldp/lldp-tlv.h
+    lib/lldp/lldp-const.h
+
 * All other components of this package are licensed under
   The Apache License Version 2.0.