[firmware-nonfree] 21/24: qlogic: Convert copyright file to structured format

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Sun Oct 18 13:49:59 UTC 2015


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

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

commit 9513cc01e1b61e02e10e638376a71163582e6ded
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Oct 18 07:43:38 2015 +0100

    qlogic: Convert copyright file to structured format
---
 debian/changelog               |   1 +
 debian/config/qlogic/copyright | 175 +++++++++++++++++++----------------------
 2 files changed, 82 insertions(+), 94 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e124592..4e2f8f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ firmware-nonfree (20151018-1) UNRELEASED; urgency=medium
     version 7.12.30.0 (for Linux 4.3 onward)
   * brcm80211: Include firmware for many more chips supported by the
     brcmfmac driver
+  * qlogic: Convert copyright file to structured format
 
   [ maximilian attems ]
   * iwlwifi: Update Intel Wireless 3160, 7260, 7265 and 7265D firmware version
diff --git a/debian/config/qlogic/copyright b/debian/config/qlogic/copyright
index 0707411..5750a7c 100644
--- a/debian/config/qlogic/copyright
+++ b/debian/config/qlogic/copyright
@@ -1,104 +1,91 @@
-The files in this package were downloaded from
-http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-
-The following notice applies to qlogic/1040.bin, qlogic/1280.bin,
-qlogic/12160.bin:
-
-Copyright:
-    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 QLogic, Inc.
-
-License:
-    Redistribution and use in source and binary forms are permitted provided
-    that the following conditions are met:
-    1. Redistribution of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistribution in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. The name of the author may not be used to endorse or promote products
-       derived from this software without specific prior written permission
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-
-The following notice applies to sd7220.fw:
-
-Copyright:
-    Copyright (c) 2007, 2008 QLogic Corporation. All rights reserved.
-
-License:
-    The OpenIB.org BSD license:
-
-        Redistribution and use in source and binary forms, with or
-        without modification, are permitted provided that the following
-        conditions are met:
-
-         - Redistributions of source code must retain the above
-           copyright notice, this list of conditions and the following
-           disclaimer.
-
-         - Redistributions in binary form must reproduce the above
-           copyright notice, this list of conditions and the following
-           disclaimer in the documentation and/or other materials
-           provided with the distribution.
-
-    THE SOFTWARE IS 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. 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 following notice applies to ql2100_fw.bin, ql2200_fw.bin,
-ql2300_fw.bin, ql2322_fw.bin, ql2400_fwbin, ql2500_fw.bin:
-
-Copyright:
-    Copyright (C) 2003-2006 QLogic Corporation
-
-License:
-    You may redistribute the hardware specific firmware binary file
-    under the following terms:
-
+Files: qlogic/1040.bin, qlogic/1280.bin, qlogic/12160.bin
+Copyright: 1995, 1996, 1997, 1998, 1999, 2000, QLogic, Inc.
+License: Binary redistribution (QLogic 1)
+ Redistribution and use in source and binary forms are permitted provided
+ that the following conditions are met:
+ 1. Redistribution of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistribution in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: sd7220.fw:
+Copyright: 2007, 2008. QLogic Corporation
+License: The OpenIB.org BSD license
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+ .
+  - Redistributions of source code must retain the above
+    copyright notice, this list of conditions and the following
+    disclaimer.
+ .
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials
+    provided with the distribution.
+ .
+ THE SOFTWARE IS 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. 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.
+
+Files: ql2100_fw.bin, ql2200_fw.bin, ql2300_fw.bin, ql2322_fw.bin,
+ ql2400_fw.bin, ql2500_fw.bin
+Copyright: 2003-2006, QLogic Corporation
+License: Binary redistribution (QLogic 2)
+ You may redistribute the hardware specific firmware binary file
+ under the following terms:
+ .
 	1. Redistribution of source code (only if applicable),
 	   must retain the above copyright notice, this list of
 	   conditions and the following disclaimer.
-
+ .
 	2. Redistribution in binary form must reproduce the above
 	   copyright notice, this list of conditions and the
 	   following disclaimer in the documentation and/or other
 	   materials provided with the distribution.
-
+ .
 	3. The name of QLogic Corporation may not be used to
 	   endorse or promote products derived from this software
 	   without specific prior written permission
-
-    REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,
-    THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "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 AUTHOR
-    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.
-
-    USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT
-    CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
-    OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,
-    TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
-    ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
-    COMBINATION WITH THIS PROGRAM.
+ .
+ REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,
+ THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "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 AUTHOR
+ 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.
+ .
+ USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT
+ CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
+ OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,
+ TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
+ ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
+ COMBINATION WITH THIS PROGRAM.

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



More information about the Kernel-svn-changes mailing list