openvswitch: Remove Linux bridge compatibility.

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

diff --git a/debian/copyright.in b/debian/copyright.in
index 8d481bd..7d5b7b7 100644 (file)
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -8,15 +8,16 @@ Upstream Authors (from AUTHORS):
 
 Upstream Copyright Holders:
 
 
 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) 2010 Jean Tourrilhes - HP-Labs.
        Copyright (c) 2008,2009,2010 Citrix Systems, Inc.
        and authors listed above.

+       Copyright (c) 2011 Gaetano Catalli

 
 License:
 
 * The following components are licensed under the
 
 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
   with the exception clause below as a pre-amble.
 
        xenserver/etc_xensource_scripts_vif


@@ -30,7 +31,7 @@ License:
          They do not appear in any binary packages.
 
   On Debian systems, the complete text of the
          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:
   `/usr/share/common-licenses/LGPL-2.1'
 
   The exception clause pre-amble reads:


@@ -50,38 +51,35 @@ License:
   Public License.
 
 * The following components are licensed under the
   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

-       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
        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'
 
   `/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/
 
   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 components are dual-licensed under the
   version 2 can be found in `/usr/share/common-licenses/GPL-2'
 
 * 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/linux/openvswitch.h

-       include/openvswitch/brcompat-netlink.h

        include/openvswitch/datapath-compat.h
        include/openvswitch/tunnel.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'.
   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 +102,7 @@ License:
   The full text of each license is also appended to the end of this
   file.
 
   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 under the

   Python Software Foundation License Version 2.
 
        python/compat/uuid.py
   Python Software Foundation License Version 2.
 
        python/compat/uuid.py