diff --git a/COPYING-note.txt b/COPYING-note.txt new file mode 100644 index 0000000..305cb8f --- /dev/null +++ b/COPYING-note.txt @@ -0,0 +1,19 @@ +Version 1.50 of os-prober contains a license clarification, the +license of the package is GPL-2+, see for example the following commits: + +http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commitdiff;h=249d0814ae9c6e308baaaad4ec4e0a403a592ffd +http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commit;h=25024daeccd86cec17353455b99af677b3b83b16 +http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commit;h=cc0ce8e5ec252b10127ca3ebb71c12cd31d4ebc4 + +The copyright file reads as of 2011-12-19: + +The majority of code in os-prober is Copyright 2004-2011 by Joshua +Kwan, Joey Hess, Christian Perrier, Colin Watson and Otavio Salvador. +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. diff --git a/os-prober.changes b/os-prober.changes index 95a706d..a346cea 100644 --- a/os-prober.changes +++ b/os-prober.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 19 11:13:44 UTC 2011 - aj@suse.de + +- Clarify license. + ------------------------------------------------------------------- Thu Dec 8 12:23:12 UTC 2011 - aj@suse.de diff --git a/os-prober.spec b/os-prober.spec index 77c608c..454c600 100644 --- a/os-prober.spec +++ b/os-prober.spec @@ -26,6 +26,7 @@ Group: System/Boot Url: http://kitenet.net/~joey/code/os-prober/ Source0: http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.gz +Source1: COPYING-note.txt # move newns binary outside of os-prober subdirectory, so that debuginfo # can be automatically generated for it Patch0: os-prober-newnsdirfix.patch @@ -48,6 +49,7 @@ distributions can be added easily. %prep %setup -q -n %{name} +cp %SOURCE1 . %patch0 -p1 %patch1 -p1 @@ -90,7 +92,7 @@ fi %files %defattr(-,root,root,-) -%doc README TODO debian/copyright debian/changelog +%doc README TODO debian/copyright debian/changelog COPYING-note.txt %{_bindir}/* %{_libexecdir}/linux-boot-probes %{_libexecdir}/newns