Clarify license version is GPL-2+, for all code written by Joey Hess, Colin

Watson, and Joshua Kwan. The license had just been "GNU GPL"; other
contributors to os-prober are encouraged to clarify which GPL versions
apply to their code.

diff --git a/debian/changelog b/debian/changelog
index 8479534..46c8e9f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+os-prober (1.50) UNRELEASED; urgency=low
+
+  * Clarify license version is GPL-2+, for all code written by Joey Hess,
+    Colin Watson, and Joshua Kwan. The license had just been "GNU GPL";
+    other contributors to os-prober are encouraged to clarify which GPL
+    versions apply to their code.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 13 Dec 2011 17:54:33 -0400
+
 os-prober (1.49) unstable; urgency=low
 
   [ Robert Millan ]

diff --git a/debian/copyright b/debian/copyright
index 342378a..f9bca6d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,9 @@
-Copyright 2004 by Joshua Kwan and Joey Hess under the terms of the GNU GPL.
+The majority of code in os-prober is Copyright 2004-2011 by
+Joshua Kwan, Joey Hess, and Colin Watson. This is licensed under the terms
+of the GNU GPL, either version 2 or, at your option, any later version.
+
+Some portions of os-prober by other contributors has an unclear license
+of "GNU GPL", with the version not specified.
 
 On Debian systems, a copy of the GNU General Public License is available in
 /usr/share/common-licenses/GPL.