[meta-opie][PATCH 1/5] layer.conf: add layer dependencies

[meta-opie][PATCH 1/5] layer.conf: add layer dependencies

[Dmitry Eremin-Solenikov]

opie layer depends on oe-core, meta-oe and meta-networking. Add
respecive dependencies via LAYERDEPENDS.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
 conf/layer.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index 0040434..f765ece 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -11,6 +11,10 @@ BBFILE_COLLECTIONS += "meta-opie"
 BBFILE_PATTERN_meta-opie := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-opie = "8"
 
+LAYERDEPENDS_meta-opie = "core"
+LAYERDEPENDS_meta-opie += "openembedded-layer"
+LAYERDEPENDS_meta-opie += "networking-layer"
+
 # Some basic definitions
 OPIE_GIT = "git://gitorious.org/opie/opie.git"
 
-- 
2.1.4

[meta-opie][PATCH 2/5] kaffe: fix LICENSE information

[Dmitry Eremin-Solenikov]

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
 recipes-qtopia/kaffe/kaffe.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qtopia/kaffe/kaffe.inc b/recipes-qtopia/kaffe/kaffe.inc
index 605e1c0..2479fdb 100644
--- a/recipes-qtopia/kaffe/kaffe.inc
+++ b/recipes-qtopia/kaffe/kaffe.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Kaffe is a clean room implementation of the Java Virtual Machine"
 HOMEPAGE = "http://www.kaffe.org/"
-LICENSE  = "GPL LGPL W3C Classpath BSD"
+LICENSE  = "GPLv2 & LGPLv2 & W3C & Classpath & BSD"
 
 DEPENDS = "virtual/javac-native fastjar-native libffi zip-native libart-lgpl"
 RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
-- 
2.1.4

[meta-opie][PATCH 3/5] konqueror-embedded: fix LICENSE information

[Dmitry Eremin-Solenikov]

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
 recipes-qtopia/konqueror/konqueror-embedded_20030705.bb | 2 +-
 recipes-qtopia/konqueror/konqueror-embedded_20060404.bb | 2 +-
 recipes-qtopia/konqueror/konqueror-embedded_20070316.bb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-qtopia/konqueror/konqueror-embedded_20030705.bb b/recipes-qtopia/konqueror/konqueror-embedded_20030705.bb
index aec037e..7de3cda 100644
--- a/recipes-qtopia/konqueror/konqueror-embedded_20030705.bb
+++ b/recipes-qtopia/konqueror/konqueror-embedded_20030705.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition
 HOMEPAGE = "http://www.konqueror.org/embedded"
 SECTION = "opie/applications"
 DEPENDS = "libqpe-opie openssl libpcre"
-LICENSE = "LGPL GPL"
+LICENSE = "LGPLv2+ & GPLv2+"
 PR = "r5"
 
 # Note if this .bb files fails with the error:
diff --git a/recipes-qtopia/konqueror/konqueror-embedded_20060404.bb b/recipes-qtopia/konqueror/konqueror-embedded_20060404.bb
index f64b93f..ff29e6a 100644
--- a/recipes-qtopia/konqueror/konqueror-embedded_20060404.bb
+++ b/recipes-qtopia/konqueror/konqueror-embedded_20060404.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition
 SECTION = "opie/applications"
 HOMEPAGE = "http://www.konqueror.org/"
 DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
-LICENSE = "LGPL GPL"
+LICENSE = "LGPLv2+ & GPLv2+"
 PR = "r3"
 
 # this Konqueror needs the KDEDIR set and the font helvetica installed on the target
diff --git a/recipes-qtopia/konqueror/konqueror-embedded_20070316.bb b/recipes-qtopia/konqueror/konqueror-embedded_20070316.bb
index 69824c2..b70efc4 100644
--- a/recipes-qtopia/konqueror/konqueror-embedded_20070316.bb
+++ b/recipes-qtopia/konqueror/konqueror-embedded_20070316.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition
 SECTION = "opie/applications"
 HOMEPAGE = "http://www.konqueror.org/"
 DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
-LICENSE = "LGPL GPL"
+LICENSE = "LGPLv2+ & GPLv2+"
 PR = "r7"
 
 # this Konqueror needs the KDEDIR set and the font helvetica installed on the target
-- 
2.1.4

[meta-opie][PATCH 4/5] qpf-bitstream-vera-sans-mono: fix LICENSE information

[Dmitry Eremin-Solenikov]

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
 recipes-qtopia/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qtopia/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb b/recipes-qtopia/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
index 95b6ebf..8451e72 100644
--- a/recipes-qtopia/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
@@ -1,7 +1,7 @@
 require qpf.inc
 
 DESCRIPTION = "Bitstream Vera Monospaced Font, QPF for Qt/Embedded"
-LICENSE = "Bitstream Vera"
+LICENSE = "BitstreamVera"
 PR = "r5"
 
 PROVIDES += "qpf-bitstream-vera-sans-mono-small"
-- 
2.1.4

[meta-opie][PATCH 5/5] qpf-bitstream-vera: fix LICENSE information

[Dmitry Eremin-Solenikov]

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
---
 recipes-qtopia/qpf-fonts/qpf-bitstream-vera_1.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qtopia/qpf-fonts/qpf-bitstream-vera_1.10.bb b/recipes-qtopia/qpf-fonts/qpf-bitstream-vera_1.10.bb
index 29e3f62..711e466 100644
--- a/recipes-qtopia/qpf-fonts/qpf-bitstream-vera_1.10.bb
+++ b/recipes-qtopia/qpf-fonts/qpf-bitstream-vera_1.10.bb
@@ -1,7 +1,7 @@
 require qpf.inc
 
 DESCRIPTION = "The Bitstream Vera fonts - QPF Edition"
-LICENSE = "Bitstream Vera"
+LICENSE = "BitstreamVera"
 PR = "r3"
 
 PROVIDES = "qpf-bitstream-vera-small qpf-bitstream-vera-large"
-- 
2.1.4