[firmware-nonfree] 08/20: ti-connectivity: Update licence text

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository firmware-nonfree.

commit 232d36b680e4090522b8b1c50be5ce3fa084c050
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Sep 17 22:52:39 2016 +0100

    ti-connectivity: Update licence text
---
 debian/changelog                      |  1 +
 debian/config/ti-connectivity/LICENSE | 50 ++---------------------------------
 2 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 169d5ea..2af83b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ firmware-nonfree (20160824-1) UNRELEASED; urgency=medium
   * brcm80211: Include Broadcom BCM4366 firmware
   * misc-nonfree: Include Sensoray 2255 firmware for use with the s2255drv
     driver
+  * ti-connectivity: Update licence text
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 28 Aug 2016 22:31:16 +0100
 
diff --git a/debian/config/ti-connectivity/LICENSE b/debian/config/ti-connectivity/LICENSE
index 520bc11..a16564b 100644
--- a/debian/config/ti-connectivity/LICENSE
+++ b/debian/config/ti-connectivity/LICENSE
@@ -1,6 +1,5 @@
-Files: ti-connectivity/wl1251-fw.bin,
- ti-connectivity/wl1251-nvs.bin
-Copyright: 2000-2013, Texas Instruments Incorporated
+Files: ti-connectivity/*
+Copyright: 2000-2016, Texas Instruments Incorporated
 License: Binary redistribution (wl1251)
  All rights reserved not granted herein.
  .
@@ -59,48 +58,3 @@ License: Binary redistribution (wl1251)
  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: ti-connectivity/*
-Copyright: 2011, Texas Instruments Incorporated
-License: TI Technology and Software Publicly Available Software License
- All rights reserved.
- .
- Redistribution.
- .
- Redistribution and use in binary form, without modification, are
- permitted provided that the following conditions are met:
- .
-  * Redistributions must preserve existing copyright notices and reproduce
-    this license (including the above copyright notice and the disclaimer below)
-    in the documentation and/or other materials provided with the distribution.
- .
-  * Neither the name of Texas Instruments Incorporated 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.
- .
- Texas Instruments Incorporated 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.  The patent license shall not apply to
- any 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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-nonfree.git