qt5: use consistent naming for LICENSE

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-qt5/recipes-qt/qt5/qt5-5.0.0.inc b/meta-qt5/recipes-qt/qt5/qt5-5.0.0.inc
index 00b43f4..e155a20 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qt5-5.0.0.inc
+++ b/meta-qt5/recipes-qt/qt5/qt5-5.0.0.inc
@@ -11,7 +11,7 @@ SRC_URI += " \
 
 S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}"
 
-LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3"
+LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
 LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \
                      file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
                      file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \

diff --git a/meta-qt5/recipes-qt/qt5/qt5-5.0.1.inc b/meta-qt5/recipes-qt/qt5/qt5-5.0.1.inc
index 00b43f4..e155a20 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qt5-5.0.1.inc
+++ b/meta-qt5/recipes-qt/qt5/qt5-5.0.1.inc
@@ -11,7 +11,7 @@ SRC_URI += " \
 
 S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}"
 
-LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3"
+LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
 LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \
                      file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
                      file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \

diff --git a/meta-qt5/recipes-qt/qt5/qt5-5.0.2+git.inc b/meta-qt5/recipes-qt/qt5/qt5-5.0.2+git.inc
index df091de..a9eff23 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qt5-5.0.2+git.inc
+++ b/meta-qt5/recipes-qt/qt5/qt5-5.0.2+git.inc
@@ -14,7 +14,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
 
 DEFAULT_PREFERENCE = "-1"
 
-LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3"
+LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
 LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
                      file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
                      file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \

diff --git a/meta-qt5/recipes-qt/qt5/qt5-5.0.2.inc b/meta-qt5/recipes-qt/qt5/qt5-5.0.2.inc
index e87f662..dc7bda1 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qt5-5.0.2.inc
+++ b/meta-qt5/recipes-qt/qt5/qt5-5.0.2.inc
@@ -14,7 +14,7 @@ SRC_URI += " \
 
 S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}"
 
-LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3"
+LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
 LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
                      file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
                      file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \