Merge branch 'mainstream'

[sliver-openvswitch.git] / debian / copyright.in

diff --git a/debian/copyright.in b/debian/copyright.in
index c81db07..3bcf332 100644 (file)
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -8,10 +8,11 @@ Upstream Authors (from AUTHORS):
 
 Upstream Copyright Holders:
 
-       Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
+       Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012 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
 
 License:
 
@@ -53,10 +54,7 @@ License:
   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-daemons-ver
+       utilities/bugtool/ovs-bugtool-*
        utilities/bugtool/plugins/kernel-info/openvswitch.xml
        utilities/bugtool/plugins/network-status/openvswitch.xml
        utilities/bugtool/plugins/system-configuration.xml
@@ -78,9 +76,7 @@ License:
   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 License
   version 2 can be found in `/usr/share/common-licenses/GPL-2'.
@@ -105,6 +101,10 @@ License:
   The full text of each license is also appended to the end of this
   file.
 
+* 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.