dpif-linux: Use get_32aligned_u64() in an appropriate place.

[openvswitch] / debian / copyright.in

diff --git a/debian/copyright.in b/debian/copyright.in
index d7ca64af68e8b2f72807dc7b6b3436ee5ad06cea..3792dd16ae19b9510d09f8c877732fc015657151 100644 (file)
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -8,7 +8,7 @@ Upstream Authors (from AUTHORS):
 
 Upstream Copyright Holders:
 
 
 Upstream Copyright Holders:
 

-       Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks.
+       Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.

        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.


@@ -52,13 +52,14 @@ License:
 * The following components are licensed under the
   GNU Lesser General Public Licence version 2.1.
 
 * The following components are licensed under the
   GNU Lesser General Public Licence version 2.1.
 

-       debian/ovs-bugtool
-       xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml [*]
-       xenserver/etc_xensource_bugtool_network-status_openvswitch.xml [*]
-       xenserver/usr_share_openvswitch_scripts_xen-bugtool-tc-class-show [*]
-
-       * These components are only distributed in the source package.
-         They do not appear in any binary packages.
+       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/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
 
   On Debian systems, the complete text of the
   GNU Lesser General Public Licence version 2.1 can be found in


@@ -82,13 +83,14 @@ License:
   On Debian systems, the complete text of the Apache License version 2.0
   can be found in '/usr/share/common-licenses/Apache-2.0'.
 
   On Debian systems, the complete text of the Apache License version 2.0
   can be found in '/usr/share/common-licenses/Apache-2.0'.
 

-* The following component is licenced under the
+* The following components are licenced under the

   Python Software Foundation License Version 2.
 
   Python Software Foundation License Version 2.
 

-       xenserver/uuid.py
+       python/compat/uuid.py
+       python/compat/argparse.py

 
 

-       * This component is only distributed in the source package.
-         It does not appear in any binary packages.
+       * These components are only distributed in the source package.
+         They do not appear in any binary packages.

 
    PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
    --------------------------------------------
 
    PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
    --------------------------------------------