[kernel] r19276 - dists/trunk/linux/debian

[Ben Hutchings]

Author: benh
Date: Sun Jul 22 17:12:36 2012
New Revision: 19276

Log:
debian/copyright: Add copyright notice for newly-added Unicode data

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

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun Jul 22 17:09:34 2012	(r19275)
+++ dists/trunk/linux/debian/changelog	Sun Jul 22 17:12:36 2012	(r19276)
@@ -7,6 +7,7 @@
   * aufs: Update to 3.x-rcN 20120618
   * rt: Disable until it is updated for Linux 3.5 or later
   * debian/copyright: Convert to machine-readable format (fka DEP-5)
+  * debian/copyright: Add copyright notice for newly-added Unicode data
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 02 Jul 2012 15:09:43 +0100
 

Modified: dists/trunk/linux/debian/copyright
==============================================================================
--- dists/trunk/linux/debian/copyright	Sun Jul 22 17:09:34 2012	(r19275)
+++ dists/trunk/linux/debian/copyright	Sun Jul 22 17:12:36 2012	(r19276)
@@ -32,6 +32,41 @@
            2005-2012 Debian kernel team
 License: GPL-2
 
+Files: fs/nls/mac-*
+Copyright: 1991-2012 Unicode, Inc.
+License: Unicode-data
+ All rights reserved.  Distributed under the Terms of Use in
+ http://www.unicode.org/copyright.html.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of the Unicode data files and any associated documentation (the "Data
+ Files") or Unicode software and any associated documentation (the
+ "Software") to deal in the Data Files or Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, and/or sell copies of the Data Files or Software, and
+ to permit persons to whom the Data Files or Software are furnished to do
+ so, provided that (a) the above copyright notice(s) and this permission
+ notice appear with all copies of the Data Files or Software, (b) both the
+ above copyright notice(s) and this permission notice appear in associated
+ documentation, and (c) there is clear notice in each modified Data File or
+ in the Software as well as in the documentation associated with the Data
+ File(s) or Software that the data or software has been modified.
+ .
+ THE DATA FILES AND SOFTWARE ARE 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 OF
+ THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+ .
+ Except as contained in this notice, the name of a copyright holder shall
+ not be used in advertising or otherwise to promote the sale, use or other
+ dealings in these Data Files or Software without prior written
+ authorization of the copyright holder.
+
 Files: include/xen/interface/*
 Copyright: 2002-2006 Keir Fraser
            2004 Tim Deegan