Include <sys/time.h> in socket-util.h

[openvswitch] / debian / copyright.in

diff --git a/debian/copyright.in b/debian/copyright.in
index 6143f1869cf49c522d4e8966aa4eb449e5463895..59fd8af082d7b580a2ff8c6861636c137a7162cf 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.


@@ -50,13 +49,15 @@ License:
   why the executable file might be covered by the GNU Lesser General
   Public License.
 
   why the executable file might be covered by the GNU Lesser General
   Public License.
 

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

   GNU Lesser General Public Licence version 2.1.
 
   GNU Lesser General Public Licence version 2.1.
 

-       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-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


@@ -137,27 +138,6 @@ 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.
 

-* ovs-bugtool is covered by the following license:
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of version 2.1 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Copyright (c) 2005, 2007 XenSource Ltd.
-   Copyright (c) 2010, Nicira Networks.
-
- On Debian systems, the complete text of the GNU Lesser General Public
- License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-

 * 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.