X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=debian%2Fcopyright.in;h=89cd2d2163be4dc5714098462f2ef5a950827899;hb=ec988646afe6aee6a63d6894a3e9b50f715d5941;hp=8d481bdcb390c4a44db3709cfe146e75aad6baad;hpb=039d283c2f1fa4859e690087006081c733db9b33;p=sliver-openvswitch.git

diff --git a/debian/copyright.in b/debian/copyright.in
index 8d481bdcb..89cd2d216 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -8,15 +8,20 @@ Upstream Authors (from AUTHORS):
 
 Upstream Copyright Holders:
 
-	Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
+	Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
 	Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
 	Copyright (c) 2008,2009,2010 Citrix Systems, Inc.
 	and authors listed above.
+	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.
 
 License:
 
 * The following components are licensed under the
-  GNU Lesser General Public Licence version 2.1 only
+  GNU Lesser General Public License version 2.1 only
   with the exception clause below as a pre-amble.
 
 	xenserver/etc_xensource_scripts_vif
@@ -30,7 +35,7 @@ License:
 	  They do not appear in any binary packages.
 
   On Debian systems, the complete text of the
-  GNU Lesser General Public Licence version 2.1 can be found in
+  GNU Lesser General Public License version 2.1 can be found in
   `/usr/share/common-licenses/LGPL-2.1'
 
   The exception clause pre-amble reads:
@@ -50,38 +55,49 @@ License:
   Public License.
 
 * The following components are licensed under the
-  GNU Lesser General Public Licence version 2.1.
+  GNU Lesser General Public License version 2.1.
 
 	utilities/bugtool/ovs-bugtool
-	utilities/bugtool/ovs-bugtool-cfm-show
-	utilities/bugtool/ovs-bugtool-lacp-show
-	utilities/bugtool/ovs-bugtool-tc-class-show
+	utilities/bugtool/ovs-bugtool-*
 	utilities/bugtool/plugins/kernel-info/openvswitch.xml
 	utilities/bugtool/plugins/network-status/openvswitch.xml
 	utilities/bugtool/plugins/system-configuration.xml
 	utilities/bugtool/plugins/system-configuration/openvswitch.xml
 
   On Debian systems, the complete text of the
-  GNU Lesser General Public Licence version 2.1 can be found in
+  GNU Lesser General Public License version 2.1 can be found in
   `/usr/share/common-licenses/LGPL-2.1'
 
-* The following component is licensed under the GNU General Public Licence
+* The following component is licensed under the GNU General Public License
   version 2.
 
 	datapath/
 
-  On Debian systems, the complete text of the GNU General Public Licence
+  On Debian systems, the complete text of the GNU General Public License
   version 2 can be found in `/usr/share/common-licenses/GPL-2'
 
+* The following file is licensed under the GNU General Public License
+  version 2.
+
+	build-aux/cccl
+
+* The following files are licensed under the 2-clause BSD 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 Licence version 2 and the Apache Licence Version 2.0.
+  GNU General Public License version 2 and the Apache License Version 2.0.
 
 	include/linux/openvswitch.h
-	include/openvswitch/brcompat-netlink.h
-	include/openvswitch/datapath-compat.h
-	include/openvswitch/tunnel.h
 
-  On Debian systems, the complete text of the GNU General Public Licence
+  On Debian systems, the complete text of the GNU General Public License
   version 2 can be found in `/usr/share/common-licenses/GPL-2'.
   On Debian systems, the complete text of the Apache License version 2.0
   can be found in '/usr/share/common-licenses/Apache-2.0'.
@@ -104,7 +120,11 @@ License:
   The full text of each license is also appended to the end of this
   file.
 
-* The following components are licenced under the
+* The following components are licensed for use as desired without restriction:
+
+	lib/crc32c.c
+
+* The following components are licensed under the
   Python Software Foundation License Version 2.
 
 	python/compat/uuid.py
@@ -176,6 +196,14 @@ License:
     .\" Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
     .\" You may freely use, modify and/or distribute this file.
 
+* m4/absolute-header.m4, by Derek Price, and m4/include_next.m4, by
+  Paul Eggert and Derek Price bear the following notices:
+
+    Copyright (C) 2006-2013 Free Software Foundation, Inc.
+    This file is free software; the Free Software Foundation
+    gives unlimited permission to copy and/or distribute it,
+    with or without modifications, as long as this notice is preserved.
+
 * All other components of this package are licensed under
   The Apache License Version 2.0.