aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2011-12-12 09:37:34 -0800
committerBen Pfaff <blp@nicira.com>2011-12-12 10:34:06 -0800
commit60b2f79fbbd3ed45d754a909917dea77c90b5e7d (patch)
treebf98e97f4096690bd2c890f3b0cbe31ac083e5b3
parent0437aeb9e78f911043f3bd0a15ba0b6888b6ee6d (diff)
debian: Correct licensing information for user/kernel shared header files.
The intent is to license all shared user/kernel header files under both GPLv2 and Apache v2. The license statement here said GPLv3 instead of GPLv2, so this commit fixes that problem. Also, include/openvswitch used to be where all the shared user/kernel header files were located, but this is no longer true, and now there is a userspace-only header file also in include/openvswitch, so this commit now lists all of the user/kernel header files explicitly. Signed-off-by: Ben Pfaff <blp@nicira.com>
-rw-r--r--debian/copyright.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/copyright.in b/debian/copyright.in
index 58db93a9..8d481bdc 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -74,9 +74,12 @@ License:
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 3 and the Apache Licence Version 2.0.
+ GNU General Public Licence version 2 and the Apache Licence Version 2.0.
- include/openvswitch/
+ 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 Licence
version 2 can be found in `/usr/share/common-licenses/GPL-2'.