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

Sun Feb 22 19:11:38 UTC 2009

Author: waldi
Date: Sun Feb 22 19:11:37 2009
New Revision: 12921

Log:
* debian/changelog: Update.
* debian/copyright
  - Update licenses.
  - Remove old stuff.


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	Sun Feb 22 19:11:37 2009
@@ -20,6 +20,7 @@
   [ Bastian Blank ]
   * Use external source directory for all builds.
   * Use dh_prep.
+  * Update copyright file.
 
   [ Martin Michlmayr ]
   * [mips/r4k-ip22] Build in RTC_DRV_DS1286.

Modified: dists/trunk/linux-2.6/debian/copyright
==============================================================================
--- dists/trunk/linux-2.6/debian/copyright	(original)
+++ dists/trunk/linux-2.6/debian/copyright	Sun Feb 22 19:11:37 2009
@@ -1,56 +1,38 @@
 This is the Debian GNU/Linux prepackaged version of the Linux kernel.
-Linux was written by Linus Torvalds <Linus.Torvalds at cs.Helsinki.FI>
-and others.
 
-This package was put together by Simon Shapiro <Shimon at i-Connect.Net>, from
-sources retrieved from directories under
-ftp.cs.helsinki.fi:/pub/Software/Linux/Kernel/
-The sources may be found at most Linux ftp sites, including 
-ftp://ftp.kernel.org/pub/linux/kernel/
+It was downloaded from http://ftp.kernel.org/pub/linux/kernel/.
 
-This package was then maintained by Sven Rudolph.
+Copyright:
 
-This package was maintained by Herbert Xu <herbert at debian.org>
-from March 1997 to May 2004.
+   Copyright (C) 1991-2009 Linus Torwalds
+   and many others
 
-This package is currently maintained by the
-Debian Kernel Team <debian-kernel at lists.debian.org>
+License:
 
-Linux is Copyright Linus Torvalds and others.
+   This package 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.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This program is distributed in the hope that it will be useful,
+   This package 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 General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
+   along with this package; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-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:
- git://git.eu.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
-
-Xen is distributed under the following license:
+On Debian systems, the complete text of the GNU General Public License version
+2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-   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:
+License for the Xen interface headers:
 
    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:
+   of this software and associated documentation files (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.
@@ -60,17 +42,7 @@
    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.
-
-The openvz patch was obtained from:
- git://git.openvz.org/pub/linux-2.6.26-openvz
-
-OpenVZ is distributed under the GPL v2 and later license and that notice:
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
 
-Nothing in this license should be construed as a grant by SWsoft of any rights
-beyond the rights specified in the GNU General Public License, and nothing in
-this license should be construed as a waiver by SWsoft of its patent, copyright
-and/or trademark rights, beyond the waiver required by the GNU General Public
-License. This license is expressly inapplicable to any product that is not
-within the scope of the GNU General Public License
+The Debian packaging is licensed under the GPL, see above.

