[kernel] r16768 - dists/trunk/firmware-nonfree/realtek

[Ben Hutchings]

Author: benh
Date: Tue Jan  4 02:40:09 2011
New Revision: 16768

Log:
Add the more permissive licence for Ethernet controller firmware

Distinguish the two licences and applicable files using draft-DEP-5 format.

Modified:
   dists/trunk/firmware-nonfree/realtek/LICENSE

Modified: dists/trunk/firmware-nonfree/realtek/LICENSE
==============================================================================
--- dists/trunk/firmware-nonfree/realtek/LICENSE	Tue Jan  4 02:34:22 2011	(r16767)
+++ dists/trunk/firmware-nonfree/realtek/LICENSE	Tue Jan  4 02:40:09 2011	(r16768)
@@ -1,39 +1,48 @@
-Copyright (c) 2009-2010, Realtek Semiconductor Corporation 
-All rights reserved.
+Files: realtek/rtl_nic/rtl8168d-*.fw
+Copyright: 2010, Realtek Semiconductor Corporation 
+License: Binary redistribution (Realtek permissive)
+ Permission is hereby granted for the distribution of this firmware
+ data in hexadecimal or equivalent format, provided this copyright
+ notice is accompanying it.
 
-Redistribution.  Redistribution and use in binary form, without 
-modification, are permitted provided that the following conditions are 
-met:
-
-* Redistributions must reproduce the above copyright notice and the 
-  following disclaimer in the documentation and/or other materials 
-  provided with the distribution. 
-* Neither the name of Realtek Semiconductor Corporation nor the names of its
-  suppliers may be used to endorse or promote products derived from this
-  software without specific prior written permission. 
-* No reverse engineering, decompilation, or disassembly of this software 
-  is permitted.
-
-Limited patent license. Realtek Semiconductor Corporation grants a world-wide, 
-royalty-free, non-exclusive license under patents it now or hereafter 
-owns or controls to make, have made, use, import, offer to sell and 
-sell ("Utilize") this software, but solely to the extent that any 
-such patent is necessary to Utilize the software alone, or in 
-combination with an operating system licensed under an approved Open 
-Source license as listed by the Open Source Initiative at 
-http://opensource.org/licenses.  The patent license shall not apply to 
-any other combinations which include this software.  No hardware per 
-se is licensed hereunder.
-
-DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGE.
+Files: realtek/RTL8192E/*, realtek/RTL8192SU/*, realtek/rtlwifi/*
+Copyright: 2009-2010, Realtek Semiconductor Corporation 
+License: Binary redistribution (Realtek restrictive)
+ All rights reserved.
+ .
+ Redistribution.  Redistribution and use in binary form, without 
+ modification, are permitted provided that the following conditions are 
+ met:
+ .
+ * Redistributions must reproduce the above copyright notice and the 
+   following disclaimer in the documentation and/or other materials 
+   provided with the distribution. 
+ * Neither the name of Realtek Semiconductor Corporation nor the names of its
+   suppliers may be used to endorse or promote products derived from this
+   software without specific prior written permission. 
+ * No reverse engineering, decompilation, or disassembly of this software 
+   is permitted.
+ .
+ Limited patent license. Realtek Semiconductor Corporation grants a world-wide, 
+ royalty-free, non-exclusive license under patents it now or hereafter 
+ owns or controls to make, have made, use, import, offer to sell and 
+ sell ("Utilize") this software, but solely to the extent that any 
+ such patent is necessary to Utilize the software alone, or in 
+ combination with an operating system licensed under an approved Open 
+ Source license as listed by the Open Source Initiative at 
+ http://opensource.org/licenses.  The patent license shall not apply to 
+ any other combinations which include this software.  No hardware per 
+ se is licensed hereunder.
+ .
+ DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
+ DAMAGE.