[kernel] r19714 - in dists/sid/firmware-nonfree: . debian linux-nonfree

[Ben Hutchings]

Author: benh
Date: Sun Jan  6 18:30:13 2013
New Revision: 19714

Log:
linux-nonfree: Add licence information for ENE UB6250 firmware (Closes: #697535)

Cherry-picked from trunk.

Modified:
   dists/sid/firmware-nonfree/   (props changed)
   dists/sid/firmware-nonfree/debian/changelog
   dists/sid/firmware-nonfree/linux-nonfree/LICENSE

Modified: dists/sid/firmware-nonfree/debian/changelog
==============================================================================
--- dists/sid/firmware-nonfree/debian/changelog	Sun Jan  6 18:27:13 2013	(r19713)
+++ dists/sid/firmware-nonfree/debian/changelog	Sun Jan  6 18:30:13 2013	(r19714)
@@ -1,3 +1,10 @@
+firmware-nonfree (0.36+wheezy.2) UNRELEASED; urgency=low
+
+  * linux-nonfree: Add licence information for ENE UB6250 firmware
+    (Closes: #697535)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 06 Jan 2013 18:19:39 +0000
+
 firmware-nonfree (0.36+wheezy.1) unstable; urgency=low
 
   * Update to linux-support-3.2.0-4

Modified: dists/sid/firmware-nonfree/linux-nonfree/LICENSE
==============================================================================
--- dists/sid/firmware-nonfree/linux-nonfree/LICENSE	Sun Jan  6 18:27:13 2013	(r19713)
+++ dists/sid/firmware-nonfree/linux-nonfree/LICENSE	Sun Jan  6 18:30:13 2013	(r19714)
@@ -221,6 +221,22 @@
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Files: linux-nonfree/ene-ub6250/*
+Copyright: 2011, ENE Technology Inc.
+License: Binary redistribution (ENE)
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
+ SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, 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 THIS SOFTWARE.
+
 Files: linux-nonfree/kaweth/*
 Copyright: 1999, Kawasaki LSI.
 License: BSD 4-clause (Kawasaki LSI)