xenserver: Reduce number of xapi DB calls in plugin

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

diff --git a/debian/copyright.in b/debian/copyright.in
index f131ea9..5a0bcfc 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.


@@ -25,7 +25,6 @@ License:
        xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
        xenserver/opt_xensource_libexec_interface-reconfigure
        xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
        xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
        xenserver/opt_xensource_libexec_interface-reconfigure
        xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py

-       xenserver/usr_sbin_xen-bugtool

 
        * These components are only distributed in the source package.
          They do not appear in any binary packages.
 
        * These components are only distributed in the source package.
          They do not appear in any binary packages.


@@ -53,11 +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/usr_sbin_xen-bugtool [*]
-
-       * This component is only distributed in the source package.
-         It does 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


@@ -81,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
    --------------------------------------------


@@ -138,6 +141,20 @@ License:
    agrees to be bound by the terms and conditions of this License
    Agreement.
 
    agrees to be bound by the terms and conditions of this License
    Agreement.
 

+* lib/ovs.tmac in the source distribution, and manpages in the
+  binaries, includes troff macros from groff 1.21 that contain the
+  following notice:
+
+    .\" an-ext.tmac
+    .\"
+    .\" Written by Eric S. Raymond <esr@thyrsus.com>
+    .\"            Werner Lemberg <wl@gnu.org>
+    .\"
+    .\" Version 2007-Feb-02
+    .\"
+    .\" Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
+    .\" You may freely use, modify and/or distribute this file.
+

 * All other components of this package are licensed under
   The Apache License Version 2.0.
 
 * All other components of this package are licensed under
   The Apache License Version 2.0.