From: Ross Burton <ross.burton@arm.com>
To: yocto@lists.yoctoproject.org
Cc: nd@arm.com
Subject: [PATCH][matchbox-panel-2] applets/startup*/startup.c: clarify license to GPLv2+
Date: Wed, 15 Mar 2023 17:30:10 +0000 [thread overview]
Message-ID: <20230315173010.3872600-1-ross.burton@arm.com> (raw)
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
reply other threads:[~2023-03-15 17:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230315173010.3872600-1-ross.burton@arm.com \
--to=ross.burton@arm.com \
--cc=nd@arm.com \
--cc=yocto@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).