Correct TrollTech GPL/QPL LICENSE field syntax

Use pipe separator which is standard for OE core, and specify GPLv2
where known.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

5 files changed, 5 insertions, 5 deletions

diff --git a/recipes-qtopia/qpf-fonts/qpf-font-common_1.0.bb b/recipes-qtopia/qpf-fonts/qpf-font-common_1.0.bb
index ba4f086..d2d8002 100644
--- a/recipes-qtopia/qpf-fonts/qpf-font-common_1.0.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-font-common_1.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Common files for Qt/Embedded fonts"
-LICENSE = "GPL QPL"
+LICENSE = "GPLv2 | QPL"
 PR = "r4"
 
 SRC_URI = "file://update-qtfontdir"
diff --git a/recipes-qtopia/qpf-fonts/qpf-helvetica_1.0.bb b/recipes-qtopia/qpf-fonts/qpf-helvetica_1.0.bb
index 306c116..86b6c56 100644
--- a/recipes-qtopia/qpf-fonts/qpf-helvetica_1.0.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-helvetica_1.0.bb
@@ -2,7 +2,7 @@ require qpf.inc
 
 DESCRIPTION = "Helvetica fonts - QPF Edition"
 HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html"
-LICENSE = "GPL QPL"
+LICENSE = "GPLv2 | QPL"
 PR = "r2"
 
 SRC_URI = "http://www.openzaurus.org/download/3.5.4/sources/qpf-helvetica.tar.bz2"
diff --git a/recipes-qtopia/qpf-fonts/qpf-qte_2.3.10.bb b/recipes-qtopia/qpf-fonts/qpf-qte_2.3.10.bb
index 07b6fbb..89e148f 100644
--- a/recipes-qtopia/qpf-fonts/qpf-qte_2.3.10.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-qte_2.3.10.bb
@@ -2,7 +2,7 @@ require qpf.inc
 
 DESCRIPTION = "Qt/Embedded fonts version ${PV}"
 HOMEPAGE = "http://www.trolltech.com"
-LICENSE = "GPL QPL"
+LICENSE = "GPLv2 | QPL"
 PR = "r2"
 
 PROVIDES  = "qte-font-helvetica-100 qte-font-helvetica-120"
diff --git a/recipes-qtopia/qpf-fonts/qpf-unifont_1.0.bb b/recipes-qtopia/qpf-fonts/qpf-unifont_1.0.bb
index 5509d63..b9409be 100644
--- a/recipes-qtopia/qpf-fonts/qpf-unifont_1.0.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-unifont_1.0.bb
@@ -1,7 +1,7 @@
 require qpf.inc
 
 DESCRIPTION = "Unicode fonts - QPF Edition"
-LICENSE = "GPL QPL"
+LICENSE = "GPLv2 | QPL"
 RPROVIDES_${PN} = "virtual-japanese-font"
 PR = "r3"
 
diff --git a/recipes-qtopia/qpf-fonts/qpf-utopia_1.0.bb b/recipes-qtopia/qpf-fonts/qpf-utopia_1.0.bb
index d936ba7..f530a18 100644
--- a/recipes-qtopia/qpf-fonts/qpf-utopia_1.0.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-utopia_1.0.bb
@@ -2,7 +2,7 @@ require qpf.inc
 
 DESCRIPTION = "Utopia fonts - QPF Edition"
 HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html"
-LICENSE = "GPL QPL"
+LICENSE = "GPL | QPL"
 PR = "r2"
 
 SRC_URI = "http://www.openzaurus.org/download/3.5.4/sources/qpf-utopia.tar.bz2"