[kernel] r9747 - in dists/trunk/linux-modules-extra-2.6: debian virtualbox-ose

[Daniel Baumann]

Author: daniel
Date: Mon Nov 26 13:43:44 2007
New Revision: 9747

Log:
Updating virtualbox-ose copyright file.

Modified:
   dists/trunk/linux-modules-extra-2.6/debian/changelog
   dists/trunk/linux-modules-extra-2.6/virtualbox-ose/copyright

Modified: dists/trunk/linux-modules-extra-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/debian/changelog	(original)
+++ dists/trunk/linux-modules-extra-2.6/debian/changelog	Mon Nov 26 13:43:44 2007
@@ -3,6 +3,7 @@
   * Adding atl2.
   * Adding provides to control (Closes: #451955).
   * Re-enabling virtualbox-ose.
+  * Updating virtualbox-ose copyright file.
 
  -- Daniel Baumann <daniel at debian.org>  Mon, 26 Nov 2007 13:54:00 +0100
 

Modified: dists/trunk/linux-modules-extra-2.6/virtualbox-ose/copyright
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/virtualbox-ose/copyright	(original)
+++ dists/trunk/linux-modules-extra-2.6/virtualbox-ose/copyright	Mon Nov 26 13:43:44 2007
@@ -22,6 +22,9 @@
 
 The following files are licensed under GPLv2:
 
+./src/VBox/Installer/linux/tunctl.c
+	Copyright 2002 Jeff Dike
+
 ./src/VBox/HostDrivers/VBoxTAP/
         Copyright (C) Damion K. Wilson, 2003
 
@@ -237,6 +240,12 @@
 A copy of this license is appended below.
 
 -------------------------------------------------------------------------------
+The complete subtree ./src/VBox/Additions/Linux/x11include is taken from the X
+sources and still carries the original license. Some work under
+./src/VBox/Additions/Linux was derived from the X sources and carries both, the
+original X license and the innotek GPL license.
+
+-------------------------------------------------------------------------------
 
 Due to license issues, parts of the Guest Additions have to be removed from the
 sourcecode. Some of the files were (c) Microsoft with an license which have to be
@@ -727,9 +736,9 @@
  You should have received a copy of the GNU General Public License along
  with this program; if not, write to the
  Free Software Foundation, Inc.,
- 59 Temple Place -
- Suite 330, Boston,
- MA 02111-1307, USA.
+ 51 Franklin St -
+ Fifth Floor, Boston,
+ MA 02110-1301, USA.
 
  *** NOTE ***
  In accordance with section 10 of the GPL, Red Hat permits programs whose sources