aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2010-09-15 10:48:47 -0600
committerEric Miao <eric.miao@linaro.org>2011-03-07 22:53:10 +0800
commit703be18aff9079cf6b7f5c762c2c6b915803e6fa (patch)
treee155fd8d6257b93a256be4e41fe2d0fb74fcbc87
parent7b5ff93ddfa712b52aa3dac80ee5dd55eda6b1e8 (diff)
downloadu-boot-linaro-natty-703be18aff9079cf6b7f5c762c2c6b915803e6fa.tar.gz
LINARO: Change debian/copyright to be GPLv2 only
The debian/copyright file in u-boot-linaro currently claims that u-boot can be distributed under the terms of GPLv2 or any later version. However, there are a number of files in this tree (including several that originate in the Linux kernel) whose license is stated to be GPLv2 only, not GPLv2 or later. Update the copyright file to state that the effective license is v2, not "or later". Signed-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian/changelog8
-rw-r--r--debian/copyright5
2 files changed, 6 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index d4bf8ded7..77224a3d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,14 +31,14 @@ u-boot-linaro (2010.09-rc1-0ubuntu2) UNRELEASED; urgency=low
Atmel, Fujitsu and Marvell
29 other arches
powerpc, nios, sh, avr32, mips
+ * Change license in debian/copyright to GPL V2 only
+ - LP: #624499
[ Matt Waddel ]
- * Support second back of flash on vexpress
+ * Support second bank of flash on vexpress
- LP: #637780
-
-
- -- John Rigby <john.rigby@linaro.org> Mon, 13 Sep 2010 17:51:23 -0600
+ -- John Rigby <john.rigby@linaro.org> Wed, 15 Sep 2010 10:51:58 -0600
u-boot-linaro (2010.06-695-gbd23130-linaro-0ubuntu1) maverick; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 5821835e0..dcc0c6070 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,9 +19,8 @@ Copyright:
License:
This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of