yocto.lists.yoctoproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH][matchbox-panel-2] applets/startup*/startup.c: clarify license to GPLv2+
@ 2023-03-15 17:30 Ross Burton
  0 siblings, 0 replies; only message in thread
From: Ross Burton @ 2023-03-15 17:30 UTC (permalink / raw)
  To: yocto; +Cc: nd

matchbox-panel was intended to be GPLv2+ licensed, however the wrong GPL
fragment was added in startup/startup.c in the original import which
stated it was GPL v2 only, and that was copied into startup-notify.

The code that this was based on, mb-applet-startup-monitor, is MIT
licensed[1] so this change isn't a problem.

[1] https://git.yoctoproject.org/matchbox-history/tree/mb-applet-startup-monitor/mbmonitor.c

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 applets/startup-notify/startup.c | 3 ++-
 applets/startup/startup.c        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/applets/startup-notify/startup.c b/applets/startup-notify/startup.c
index c69bddb..1f3f267 100644
--- a/applets/startup-notify/startup.c
+++ b/applets/startup-notify/startup.c
@@ -11,7 +11,8 @@
  *
  * This program 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; version 2 of the license.
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/applets/startup/startup.c b/applets/startup/startup.c
index 3d3f0d7..fb0fe73 100644
--- a/applets/startup/startup.c
+++ b/applets/startup/startup.c
@@ -15,7 +15,8 @@
  *
  * This program 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; version 2 of the license.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- 
2.34.1



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2023-03-15 17:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-15 17:30 [PATCH][matchbox-panel-2] applets/startup*/startup.c: clarify license to GPLv2+ Ross Burton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).