merge of 03133e2efc4b4ffe3f1544aca8171a7da90221f9

     and 7c7ad63dfa7e9cf84ed42393167d84da1f7c2030

5 files changed, 18 insertions, 14 deletions

diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index 93e7c0b0a8..306d31a39e 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r36"
 
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 
 gpe-base-depends = "\
     diet-x11 \
@@ -32,7 +32,7 @@ gpe-task-base = "\
     gpe-autostarter \
     libgtkstylus \
     detect-stylus \
-    teleport \	
+    teleport \
     xauth"
 
 RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \
@@ -102,4 +102,4 @@ DEPENDS += " ${gpe-task-games}"
 
 DEPENDS += "matchbox-themes-extra"
 
-LICENSE = MIT
+LICENSE = "MIT"
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index 6f8e886a22..17b9c66653 100644
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -4,7 +4,7 @@ PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task
 DESCRIPTION = "Meta-package for maemo environment"
 MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 
 maemo-base-depends = "\
     diet-x11 \
@@ -80,7 +80,7 @@ maemo-task-apps = "\
     hildon-home \
     hildon-navigator \
     hildon-control-panel \
-    osso-application-installer \ 
+    osso-application-installer \
     osso-app-killer \
     osso-screenshot-tool \
     gpe-todo-hildon \
@@ -89,4 +89,4 @@ maemo-task-apps = "\
 RDEPENDS_maemo-task-apps := "${maemo-task-apps}"
 DEPENDS += " ${maemo-task-apps}"
 
-LICENSE = MIT
+LICENSE = "MIT"
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index 6976699029..db9d86cdd6 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Meta-package for GPE Security Testing Image"
 MAINTAINER = "Bob Davies tyggerbob@rogers.com>"
 PR = "r5"
 
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 
 gpe-base-depends = "\
     diet-x11 \
@@ -84,7 +84,7 @@ sectest-task-apps = "\
     kismet \
     hydra \
     thcrut \
-    driftnet \		
+    driftnet \
 	miniclipboard"
 
 RDEPENDS_sectest-task-apps := "${sectest-task-apps}"
@@ -93,4 +93,4 @@ DEPENDS += " ${sectest-task-apps}"
 
 DEPENDS += "matchbox-themes-extra gtk-industrial-engine"
 
-LICENSE = MIT
+LICENSE = "MIT"
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index a2b2e79bdb..c2d15dee58 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -36,7 +36,7 @@ OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh \
 OPIE_BASE_DEPENDS = "ipkg timezones ntp bluez-utils-nodbus irda-utils \
                      openobex-apps libopieobex0 wireless-tools usbutils"
 OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset \
-                      bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools usbutils"
+                      bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools "
 
 #
 # Clamshell models can benefit from the autorotate applet
@@ -98,5 +98,9 @@ def opie_more_rdepends(d):
         if root_flash_size >= 24: return bb.data.getVar( "OPIE_RDEPENDS_24", d, True )
         else: return " "
 
-OPIE_MORE_DEPENDS := "${@opie_more_depends(d)}"    
-OPIE_MORE_RDEPENDS := "${@opie_more_rdepends(d)}"
+OPIE_MORE_DEPENDS := "${@opie_more_depends(d)}"
+
+
+
+
+# # OPIE_MORE_RDEPENDS := "${@opie_more_rdepends(d)}"
diff --git a/packages/meta/pivotboot-image.bb b/packages/meta/pivotboot-image.bb
index 7d533e3806..0b8211cb8a 100644
--- a/packages/meta/pivotboot-image.bb
+++ b/packages/meta/pivotboot-image.bb
@@ -12,6 +12,6 @@ FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${D
                                   e##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/e"
 
 FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \
-                               opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie \
+                               opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
 
-LICENSE = MIT
+LICENSE = "MIT"