[Qemu-devel] [PATCH v2] ui/gtk: Fix the license information

[Qemu-devel] [PATCH v2] ui/gtk: Fix the license information

[Thomas Huth]

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>
---
 v2: Move the boilerplate code to the top

 ui/gtk.c | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index 949b143..ff505ae 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"
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH v2] ui/gtk: Fix the license information

[Daniel P. Berrangé]

On Thu, Feb 21, 2019 at 07:51:42AM +0100, Thomas Huth wrote:
> 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>
> ---
>  v2: Move the boilerplate code to the top
> 
>  ui/gtk.c | 30 +++++++++++++-----------------
>  1 file changed, 13 insertions(+), 17 deletions(-)
> 
> diff --git a/ui/gtk.c b/ui/gtk.c
> index 949b143..ff505ae 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):

s/v2/v2+/

With that fixed

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH v2] ui/gtk: Fix the license information

[Gerd Hoffmann]

> > + * Portions from gtk-vnc (originally licensed under the LGPL v2):
> 
> s/v2/v2+/
> 
> With that fixed

Fixed and queued up.

thanks,
  Gerd