The scripts carry this copyright notice:

    # This work is licensed under the terms of the GNU GPLv2.
    # See the COPYING.LIB file in the top-level directory.

The sentences contradict each other, as COPYING.LIB contains the LGPL
2.1.  Michael Roth says this was a simple pasto, and he meant to refer
COPYING.  Let's fix that.

Relicense to GPLv2+ while we're at it.

Need permission from all previous signers.  We already got permission
for blanket relicensing of GPLv2-only code to GPLv2+ from Blue Swirl
<blauwir...@gmail.com>, Stefan Weil <s...@weilnetz.de>, and Red Hat.
All remaining signers are cc'ed.

Cc: Andreas Färber <afaer...@suse.de>
Cc: Anthony Liguori <anth...@codemonkey.ws>
Cc: Michael Roth <mdr...@linux.vnet.ibm.com>
Cc: Peter Maydell <peter.mayd...@linaro.org>
Cc: Richard Henderson <r...@twiddle.net>
Cc: Tomoki Sekiyama <tomoki.sekiy...@hds.com>
Signed-off-by: Markus Armbruster <arm...@redhat.com>
---
 scripts/qapi-commands.py | 4 ++--
 scripts/qapi-types.py    | 4 ++--
 scripts/qapi-visit.py    | 4 ++--
 scripts/qapi.py          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index b12b696..0b2467f 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -7,8 +7,8 @@
 #  Anthony Liguori <aligu...@us.ibm.com>
 #  Michael Roth    <mdr...@linux.vnet.ibm.com>
 #
-# This work is licensed under the terms of the GNU GPLv2.
-# See the COPYING.LIB file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later.  See the COPYING file in the top-level directory.
 
 from ordereddict import OrderedDict
 from qapi import *
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 4a1652b..d48fe41 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -6,8 +6,8 @@
 # Authors:
 #  Anthony Liguori <aligu...@us.ibm.com>
 #
-# This work is licensed under the terms of the GNU GPLv2.
-# See the COPYING.LIB file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later.  See the COPYING file in the top-level directory.
 
 from ordereddict import OrderedDict
 from qapi import *
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 65f1a54..1ab216e 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -7,8 +7,8 @@
 #  Anthony Liguori <aligu...@us.ibm.com>
 #  Michael Roth    <mdr...@linux.vnet.ibm.com>
 #
-# This work is licensed under the terms of the GNU GPLv2.
-# See the COPYING.LIB file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later.  See the COPYING file in the top-level directory.
 
 from ordereddict import OrderedDict
 from qapi import *
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 9b3de4c..4472803 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -8,8 +8,8 @@
 #  Anthony Liguori <aligu...@us.ibm.com>
 #  Markus Armbruster <arm...@redhat.com>
 #
-# This work is licensed under the terms of the GNU GPLv2.
-# See the COPYING.LIB file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later.  See the COPYING file in the top-level directory.
 
 from ordereddict import OrderedDict
 import sys
-- 
1.8.1.4


Reply via email to