ACK: [PATCH] debian: update copyright to conform to copyright-format 1.0
Colin Ian King
colin.king at canonical.com
Wed Jun 13 09:08:46 UTC 2012
On 11/06/12 11:44, Keng-Yu Lin wrote:
> The format is described in
> http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
>
> The patch does not alter any copyright or license; just does the re-formatting.
>
> Signed-off-by: Keng-Yu Lin <kengyu at canonical.com>
> ---
> debian/copyright | 55 +++++++++++++++++++++++++++---------------------------
> 1 file changed, 28 insertions(+), 27 deletions(-)
>
> diff --git a/debian/copyright b/debian/copyright
> index 2c297a8..4e19918 100644
> --- a/debian/copyright
> +++ b/debian/copyright
> @@ -1,12 +1,14 @@
> -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
> -Name: fwts
> -Maintainer: Colin King <colin.king at ubuntu.com>
> -Source: http://kernel.ubuntu.com/git?p=cking/fwts/.git
> +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
> +Upstream-Name: fwts
> +Source: git://kernel.ubuntu.com/hwe/fwts
>
> Files: *
> src/acpica/source/compiler/fwts_iasl_interface.c
> src/acpica/source/compiler/fwts_iasl_interface.h
> Copyright: 2010, Canonical Ltd
> +License: GPL-2
> + On Debian systems, the complete text of the GNU General Public
> + License can be found in `/usr/share/common-licenses/GPL-2'.
>
> Files: src/acpi/acpiinfo/acpiinfo.c
> src/acpi/battery/battery.c
> @@ -26,6 +28,9 @@ Files: src/acpi/acpiinfo/acpiinfo.c
> src/pci/maxreadreq/maxreadreq.c
> Copyright: 2010, Canonical Ltd
> 2006, Intel Corporation
> +License: GPL-2
> + On Debian systems, the complete text of the GNU General Public
> + License can be found in `/usr/share/common-licenses/GPL-2'.
>
> Files: src/cpu/virt/virt.c
> src/lib/include/fwts_virt.h
> @@ -33,10 +38,9 @@ Files: src/cpu/virt/virt.c
> Copyright: 2010, Canonical Ltd
> 2007, AMD Inc
> 2006, Intel Corporation
> -
> License: GPL-2
> -On Debian systems, the complete text of the GNU General Public
> -License can be found in `/usr/share/common-licenses/GPL-2'.
> + On Debian systems, the complete text of the GNU General Public
> + License can be found in `/usr/share/common-licenses/GPL-2'.
>
> Files: src/cpu/virt/virt_svm.c
> src/cpu/virt/virt_vmx.c
> @@ -44,28 +48,26 @@ Copyright: 2010, Canonical Ltd
> 2007, AMD Inc
> 2006, Intel Corporation
> License: LGPL
> -
> -On Debian systems, the complete text of the GNU General Public
> -License can be found in `/usr/share/common-licenses/LGPL'.
> + On Debian systems, the complete text of the GNU General Public
> + License can be found in `/usr/share/common-licenses/LGPL'.
>
> Files: src/acpcia/source/*
> Copyright: Copyright (c) 1999 - 2010, Intel Corp.
> -Licence: other
> -
> +License: other
> 2. License
> -
> + .
> 2.1. This is your license from Intel Corp. under its intellectual property
> rights. You may have additional license terms from the party that provided
> you this software, covering your right to use that party's intellectual
> property rights.
> -
> + .
> 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
> copy of the source code appearing in this file ("Covered Code") an
> irrevocable, perpetual, worldwide license under Intel's copyrights in the
> base code distributed originally by Intel ("Original Intel Code") to copy,
> make derivatives, distribute, use and display any portion of the Covered
> Code in any form, with the right to sublicense such rights; and
> -
> + .
> 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
> license (with the right to sublicense), under only those claims of Intel
> patents that are infringed by the Original Intel Code, to make, use, sell,
> @@ -74,12 +76,12 @@ Licence: other
> license, and in no event shall the patent license extend to any additions
> to or modifications of the Original Intel Code. No other license or right
> is granted directly or by implication, estoppel or otherwise;
> -
> + .
> The above copyright and patent license is granted only if the following
> conditions are met:
> -
> + .
> 3. Conditions
> -
> + .
> 3.1. Redistribution of Source with Rights to Further Distribute Source.
> Redistribution of source code of any substantial portion of the Covered
> Code or modification with rights to further distribute source must include
> @@ -91,7 +93,7 @@ Licence: other
> documentation of any changes made by any predecessor Licensee. Licensee
> must include a prominent statement that the modification is derived,
> directly or indirectly, from Original Intel Code.
> -
> + .
> 3.2. Redistribution of Source with no Rights to Further Distribute Source.
> Redistribution of source code of any substantial portion of the Covered
> Code or modification without rights to further distribute source must
> @@ -103,23 +105,23 @@ Licence: other
> property embodied in the software Licensee provides to its licensee, and
> not to intellectual property embodied in modifications its licensee may
> make.
> -
> + .
> 3.3. Redistribution of Executable. Redistribution in executable form of any
> substantial portion of the Covered Code or modification must reproduce the
> above Copyright Notice, and the following Disclaimer and Export Compliance
> provision in the documentation and/or other materials provided with the
> distribution.
> -
> + .
> 3.4. Intel retains all right, title, and interest in and to the Original
> Intel Code.
> -
> + .
> 3.5. Neither the name Intel nor any other trademark owned or controlled by
> Intel shall be used in advertising or otherwise to promote the sale, use or
> other dealings in products derived from or relating to the Covered Code
> without prior written authorization from Intel.
> -
> + .
> 4. Disclaimer and Export Compliance
> -
> + .
> 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
> HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
> IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
> @@ -127,7 +129,7 @@ Licence: other
> UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
> IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
> PARTICULAR PURPOSE.
> -
> + .
> 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
> OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
> COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
> @@ -136,7 +138,7 @@ Licence: other
> HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
> SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
> LIMITED REMEDY.
> -
> + .
> 4.3. Licensee shall not export, either directly or indirectly, any of this
> software or system incorporating such software without first obtaining any
> required license or other approval from the U. S. Department of Commerce or
> @@ -151,4 +153,3 @@ Licence: other
> United States government or any agency thereof requires an export license,
> other governmental approval, or letter of assurance, without first obtaining
> such license, approval or letter.
> -
>
Sorry, I somehow missed this in my inbox
Acked-by: Colin Ian King <colin.king at canonical.com>
More information about the fwts-devel
mailing list