qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Eric Blake" <eblake@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>
Subject: [Qemu-devel] [PULL 04/15] ui/gtk: Fix the license information
Date: Fri, 22 Feb 2019 08:53:15 +0100	[thread overview]
Message-ID: <20190222075326.9850-5-kraxel@redhat.com> (raw)
In-Reply-To: <20190222075326.9850-1-kraxel@redhat.com>

From: Thomas Huth <thuth@redhat.com>

The license information in this file is very messy. A short note at
the beginning says GPL first, but the long boilerplate code then
talks about "GNU Lesser General Public License version 2.0". First,
there is no such version of the "GNU Lesser GPL", it only started with
version 2.1. In version 2.0, it was still called "GNU Library GPL"
instead. Second, you can easily get the license of this file wrong
if you only quickly glance at the long boilerplate code.

Anyway, looking at the text of the LGPL (see COPYING.LIB in the top
directory), the license clearly states in section "3." that one should
rather replace the license information with the GPL information in
such a case of a mixture instead. Thus let's clean up the confusing
statements and use the proper GPL text only.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 1550731902-28842-1-git-send-email-thuth@redhat.com

[ kraxel: s/v2/v2+/ as requested by Daniel ]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/gtk.c | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index 949b143e4e4e..e96e15435a2f 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -6,29 +6,25 @@
  * Authors:
  *  Anthony Liguori   <aliguori@us.ibm.com>
  *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * Portions from gtk-vnc:
+ * 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 FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Portions from gtk-vnc (originally licensed under the LGPL v2+):
  *
  * GTK VNC Widget
  *
  * Copyright (C) 2006  Anthony Liguori <anthony@codemonkey.ws>
  * Copyright (C) 2009-2010 Daniel P. Berrange <dan@berrange.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.0 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #define GETTEXT_PACKAGE "qemu"
-- 
2.9.3

  parent reply	other threads:[~2019-02-22  7:53 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-22  7:53 [Qemu-devel] [PULL 00/15] Ui 20190222 patches Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 01/15] kbd-state: don't block auto-repeat events Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 02/15] spice: set device address and device display ID in QXL interface Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 03/15] sdl2: drop qemu_input_event_send_key_qcode call Gerd Hoffmann
2019-02-22  7:53 ` Gerd Hoffmann [this message]
2019-02-22  7:53 ` [Qemu-devel] [PULL 05/15] char/spice: trigger HUP event Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 06/15] char/spice: discard write() if backend is disconnected Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 07/15] spice: avoid spice runtime assert Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 08/15] spice: merge options lists Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 09/15] spice: do not stop spice if VM is paused Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 10/15] char: move SpiceChardev and open_spice_port() to spice.h header Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 11/15] char: register spice ports after spice started Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 12/15] build-sys: add gio-2.0 check Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 13/15] qapi: document DisplayType enum Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 14/15] spice: use a default name for the server Gerd Hoffmann
2019-02-22  7:53 ` [Qemu-devel] [PULL 15/15] display: add -display spice-app launching a Spice client Gerd Hoffmann
2019-02-25 12:48 ` [Qemu-devel] [PULL 00/15] Ui 20190222 patches Peter Maydell

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=20190222075326.9850-5-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /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).