[kernel] r8739 - dists/trunk/linux-2.6/debian

[Dann Frazier]

Author: dannf
Date: Thu May 24 00:42:32 2007
New Revision: 8739

Log:
* Add Xen licensing info to the copyright file. (closes: #368912)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/copyright

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu May 24 00:42:32 2007
@@ -23,7 +23,10 @@
   [ Martin Michlmayr ]
   * mipsel/r5k-cobalt: Use the new RTC system.
 
- -- maximilian attems <maks at debian.org>  Wed, 23 May 2007 12:38:57 +0200
+  [ dann frazier ]
+  * Add Xen licensing info to the copyright file. (closes: #368912)
+
+ -- dann frazier <dannf at debian.org>  Wed, 23 May 2007 18:41:33 -0600
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/copyright
==============================================================================
--- dists/trunk/linux-2.6/debian/copyright	(original)
+++ dists/trunk/linux-2.6/debian/copyright	Thu May 24 00:42:32 2007
@@ -33,3 +33,32 @@
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Xen patch was obtained from:
+ http://hg.et.redhat.com/kernel/linux-2.6.18-xen
+
+Xen is distributed under the following license:
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License version 2
+   as published by the Free Software Foundation; or, when distributed
+   separately from the Linux kernel or incorporated into other
+   software packages, subject to the following license:
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this source file (the "Software"), to deal in the Software without
+   restriction, including without limitation the rights to use, copy, modify,
+   merge, publish, distribute, sublicense, and/or sell copies of the Software,
+   and to permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+   IN THE SOFTWARE.