[firmware-nonfree] 08/10: copyright: Fix structured copyright files

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Sat Dec 3 21:57:22 UTC 2016 

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

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

commit 59253394ef72eaffdfea4788895ff481e4be0940
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Dec 3 20:59:27 2016 +0000

    copyright: Fix structured copyright files
    
    Follow the machine-readable debian/copyright format version 1.0
    (previously known as DEP-5).
    
    Correct placement of common licence texts in structured copyright files
    - they need to be put in their own License paragraph, not in a random
    Files paragraph.
    
    Replace the templated introductory text with the required Header
    paragraph.  ('LICENSE' files are substituted into the template;
    'copyright' files are not.)
---
 debian/changelog                                   |  2 +
 debian/config/amd-graphics/{LICENSE => copyright}  |  5 ++
 debian/config/atheros/{LICENSE => copyright}       | 19 ++---
 debian/config/intel-sound/{LICENSE => copyright}   |  5 ++
 debian/config/libertas/{LICENSE => copyright}      |  5 ++
 debian/config/misc-nonfree/{LICENSE => copyright}  | 83 ++++++++++++----------
 debian/config/qlogic/copyright                     |  5 ++
 debian/config/realtek/{LICENSE => copyright}       |  5 ++
 .../config/ti-connectivity/{LICENSE => copyright}  |  5 ++
 9 files changed, 88 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 807ee78..6ed3be2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ firmware-nonfree (20161130-1) UNRELEASED; urgency=medium
     RTl8192EU firmare and RTl8723BU firmware
   * Use debhelper compatibility level 9
   * debian/control: Update Standards-Version to 3.9.8; no changes needed
+  * copyright: Fix structured copyright files to follow the machine-
+    readable debian/copyright format version 1.0
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 02 Dec 2016 22:53:26 +0000
 
diff --git a/debian/config/amd-graphics/LICENSE b/debian/config/amd-graphics/copyright
similarity index 95%
rename from debian/config/amd-graphics/LICENSE
rename to debian/config/amd-graphics/copyright
index 05a822d..7ecd3f0 100644
--- a/debian/config/amd-graphics/LICENSE
+++ b/debian/config/amd-graphics/copyright
@@ -1,3 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: linux-firmware
+Upstream-Contact: linux-firmware at kernel.org
+Source: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git
+
 Files: r128/r128_cce.bin, radeon/*_cp.bin,
  radeon/R600_me.bin, radeon/R600_pfp.bin,
  radeon/RS780_*.bin, radeon/RV*_me.bin,
diff --git a/debian/config/atheros/LICENSE b/debian/config/atheros/copyright
similarity index 97%
rename from debian/config/atheros/LICENSE
rename to debian/config/atheros/copyright
index 4338667..d78f2d3 100644
--- a/debian/config/atheros/LICENSE
+++ b/debian/config/atheros/copyright
@@ -1,3 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: linux-firmware
+Upstream-Contact: linux-firmware at kernel.org
+Source: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git
+
 Files: ar3k/*, ar5523.bin, ar7010.fw, ar7010_1_1.fw, ar9271.fw, ath3k-1.fw,
  ath6k/*/*/*, htc_7010.fw, htc_9271.fw
 Copyright: 2008-2010, Atheros Communications, Inc.
@@ -172,6 +177,12 @@ Copyright: 1986, Gary S. Brown
            2011-2015, Qualcomm Atheros, Inc.
            2013, Synopsys, Inc.
 License: Binary redistribution (Qualcomm Atheros)
+
+Files: ath10k/QCA*/hw*/board.bin qca/nvm_*.bin qca/rampatch_*.bin
+Copyright: 2015, Qualcomm Atheros, Inc.
+License: Binary redistribution (Qualcomm Atheros)
+
+License: Binary redistribution (Qualcomm Atheros)
  All rights reserved.
  .
  Redistribution. Reproduction and redistribution in binary form, without
@@ -218,11 +229,3 @@ License: Binary redistribution (Qualcomm Atheros)
  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: ath10k/QCA*/hw*/board.bin
-Copyright: 2015, Qualcomm Atheros, Inc.
-License: Binary redistribution (Qualcomm Atheros)
-
-Files: qca/nvm_*.bin qca/rampatch_*.bin
-Copyright: 2015, Qualcomm Atheros, Inc.
-License: Binary redistribution (Qualcomm Atheros)
diff --git a/debian/config/intel-sound/LICENSE b/debian/config/intel-sound/copyright
similarity index 99%
rename from debian/config/intel-sound/LICENSE
rename to debian/config/intel-sound/copyright
index cdeca0f..52dd33d 100644
--- a/debian/config/intel-sound/LICENSE
+++ b/debian/config/intel-sound/copyright
@@ -1,3 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: linux-firmware
+Upstream-Contact: linux-firmware at kernel.org
+Source: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git
+
 Files: intel/IntcSST2.bin
 Copyright: 2014, Intel Corporation.
 License: Binary redistribution (Intel 1)
diff --git a/debian/config/libertas/LICENSE b/debian/config/libertas/copyright
similarity index 94%
rename from debian/config/libertas/LICENSE
rename to debian/config/libertas/copyright
index d26eca6..704f49e 100644
--- a/debian/config/libertas/LICENSE
+++ b/debian/config/libertas/copyright
@@ -1,3 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: linux-firmware
+Upstream-Contact: linux-firmware at kernel.org
+Source: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git
+
 Files: libertas/*, mwl8k/*
 Copyright: Marvell International Ltd.
 License: Binary redistribution (Marvell 1)
diff --git a/debian/config/misc-nonfree/LICENSE b/debian/config/misc-nonfree/copyright
similarity index 99%
rename from debian/config/misc-nonfree/LICENSE
rename to debian/config/misc-nonfree/copyright
index 77a8ddb..70284fc 100644
--- a/debian/config/misc-nonfree/LICENSE
+++ b/debian/config/misc-nonfree/copyright
@@ -1,3 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: linux-firmware
+Upstream-Contact: linux-firmware at kernel.org
+Source: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git
+
 Files: 3com/typhoon.bin
 Copyright: 1999-2004, 3Com Corporation
 License: BSD (3Com)
@@ -360,44 +365,6 @@ License: Redistributable (Micronas)
 Files: i915/*
 Copyright: 2015, Intel Corporation
 License: Binary redistribution (Intel)
- 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 Intel 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.  Intel 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: kaweth/*
 Copyright: 1999, Kawasaki LSI.
@@ -768,3 +735,43 @@ License: Binary redistribution (Conexant)
  These firmware files are distributed in the hope that they will be
  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+License: Binary redistribution (Intel)
+ 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 Intel 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.  Intel 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.
diff --git a/debian/config/qlogic/copyright b/debian/config/qlogic/copyright
index 4a34274..88c847d 100644
--- a/debian/config/qlogic/copyright
+++ b/debian/config/qlogic/copyright
@@ -1,3 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: linux-firmware
+Upstream-Contact: linux-firmware at kernel.org
+Source: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git
+
 Files: qlogic/1040.bin, qlogic/1280.bin, qlogic/12160.bin
 Copyright: 1995, 1996, 1997, 1998, 1999, 2000, QLogic, Inc.
 License: Binary redistribution (QLogic 1)
diff --git a/debian/config/realtek/LICENSE b/debian/config/realtek/copyright
similarity index 91%
rename from debian/config/realtek/LICENSE
rename to debian/config/realtek/copyright
index d87b6f8..0d4de85 100644
--- a/debian/config/realtek/LICENSE
+++ b/debian/config/realtek/copyright
@@ -1,3 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: linux-firmware
+Upstream-Contact: linux-firmware at kernel.org
+Source: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git
+
 Files: rtl_nic/*
 Copyright: 2010-2013, Realtek Semiconductor Corporation 
 License: Binary redistribution (Realtek permissive)
diff --git a/debian/config/ti-connectivity/LICENSE b/debian/config/ti-connectivity/copyright
similarity index 92%
rename from debian/config/ti-connectivity/LICENSE
rename to debian/config/ti-connectivity/copyright
index a16564b..585d6ed 100644
--- a/debian/config/ti-connectivity/LICENSE
+++ b/debian/config/ti-connectivity/copyright
@@ -1,3 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: linux-firmware
+Upstream-Contact: linux-firmware at kernel.org
+Source: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git
+
 Files: ti-connectivity/*
 Copyright: 2000-2016, Texas Instruments Incorporated
 License: Binary redistribution (wl1251)

-- 
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