From b47219cd55274e090f993461898e3d8feab2051d40e485866740586b9961d164 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 8 Dec 2011 12:21:20 +0000 Subject: [PATCH 1/3] Accepting request 95919 from devel:openSUSE:Factory:for-legal - this seems to be "GPL" as it was understood 2004, so guessing GPL-2.0+ OBS-URL: https://build.opensuse.org/request/show/95919 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=5 --- os-prober.changes | 6 ++++++ os-prober.spec | 10 ++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/os-prober.changes b/os-prober.changes index e9b6be3..1703e4e 100644 --- a/os-prober.changes +++ b/os-prober.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 8 11:18:49 UTC 2011 - coolo@suse.com + +- this seems to be "GPL" as it was understood 2004, so guessing + GPL-2.0+ + ------------------------------------------------------------------- Fri Sep 30 15:53:26 UTC 2011 - uli@suse.com diff --git a/os-prober.spec b/os-prober.spec index 589fa05..22c84d1 100644 --- a/os-prober.spec +++ b/os-prober.spec @@ -15,16 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: os-prober Version: 1.47 -Release: 1 +Release: 0 Summary: Probes disks on the system for installed operating systems - -License: GPL -Url: http://kitenet.net/~joey/code/os-prober/ +License: GPL-2.0+ 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 # move newns binary outside of os-prober subdirectory, so that debuginfo # can be automatically generated for it From d1552e0b86fe6e377337fc7e3eaeb44b6e952f5eba0855cf0ba007b31f3853d3 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 8 Dec 2011 12:25:14 +0000 Subject: [PATCH 2/3] Accepting request 95926 from home:a_jaeger:my-factory-packages Update to 1.49 OBS-URL: https://build.opensuse.org/request/show/95926 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=6 --- os-prober.changes | 7 +++++++ os-prober.spec | 4 +++- os-prober_1.47.tar.gz | 3 --- os-prober_1.49.tar.gz | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 os-prober_1.47.tar.gz create mode 100644 os-prober_1.49.tar.gz diff --git a/os-prober.changes b/os-prober.changes index 1703e4e..95a706d 100644 --- a/os-prober.changes +++ b/os-prober.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 8 12:23:12 UTC 2011 - aj@suse.de + +- Update to 1.49: + * MeeGo detection support + * Bugfixes + ------------------------------------------------------------------- Thu Dec 8 11:18:49 UTC 2011 - coolo@suse.com diff --git a/os-prober.spec b/os-prober.spec index 22c84d1..77c608c 100644 --- a/os-prober.spec +++ b/os-prober.spec @@ -15,8 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: os-prober -Version: 1.47 +Version: 1.49 Release: 0 Summary: Probes disks on the system for installed operating systems License: GPL-2.0+ diff --git a/os-prober_1.47.tar.gz b/os-prober_1.47.tar.gz deleted file mode 100644 index 3a1d75b..0000000 --- a/os-prober_1.47.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:702c8e0bc148c13708d9e52cf8255b5d7bcd6fbabac3d823f506f2fe2376654f -size 24896 diff --git a/os-prober_1.49.tar.gz b/os-prober_1.49.tar.gz new file mode 100644 index 0000000..388ffc7 --- /dev/null +++ b/os-prober_1.49.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:828118ee0792263179572f5a7669f20c787dd61e7bfb2954a34ea0d62f94fc14 +size 24422 From 447fa20febbb4f33c2a7c5c097ce8b8aea218e8508a7a6b3aa58d86efb6cd38a Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 19 Dec 2011 11:15:34 +0000 Subject: [PATCH 3/3] Accepting request 97026 from home:a_jaeger:my-factory-packages Clarify license OBS-URL: https://build.opensuse.org/request/show/97026 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=7 --- COPYING-note.txt | 19 +++++++++++++++++++ os-prober.changes | 5 +++++ os-prober.spec | 4 +++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 COPYING-note.txt 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