7 files changed, 15 insertions, 12 deletions
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index ec4d225b78..a042032422 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -5,7 +5,7 @@ FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${D
 FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/gpe"
 
-PR = "r9"
+PR = "r10"
 
 export IMAGE_BASENAME = "gpe-image"
 
@@ -18,11 +18,11 @@ GPE_EXTRA_THEMES = "gtk-theme-industrial gtk-industrial-engine matchbox-themes-e
 
 #GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
 #GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
-GPE_EXTRA_DEPENDS_bigscreen = "minimo"
-GPE_EXTRA_INSTALL_bigscreen = "minimo gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_DEPENDS_bigscreen = "minimo figment"
+GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES}"
 
-GPE_EXTRA_DEPENDS_smallscreen = "minimo linphone-hh"
-GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_DEPENDS_smallscreen = "minimo figment linphone-hh"
+GPE_EXTRA_INSTALL_smallscreen = "minimo figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}"
 
 GPE_EXTRA_DEPENDS_none = ""
 GPE_EXTRA_INSTALL_none = ""
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index bfc7e043bc..60a11fc590 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,7 +1,7 @@
 PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r33"
+PR = "r34"
 
 ALLOW_EMPTY = 1
 
@@ -49,8 +49,7 @@ gpe-task-pim = "\
     gpe-calendar \
     gpe-sketchbook \
     gpe-contacts \
-    gpe-today \
-    figment"
+    gpe-today"
 RDEPENDS_gpe-task-pim := "${gpe-task-pim}"
 DEPENDS += " ${gpe-task-pim}"
 
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 87c12b8f60..0f745831a2 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -59,7 +59,7 @@ opie-suspendapplet \
 opie-vmemo \
 opie-volumeapplet \
 opie-vtapplet \
-opie-zkbapplet \ 
+opie-zkbapplet \
 "
 RDEPENDS_task-opie-applets = "${task-opie-applets}"
 DEPENDS += " ${task-opie-applets}"
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index 66b1037380..7bfcae10f9 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -82,8 +82,10 @@ gpe-task-apps = "\
     btscanner \
     curl \
     dsniff \
-    kismet \
     prismstumbler \
+    prismstumbler-frontend \
+    dillo \
+    tcpdump \
     miniclipboard"
 
 RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
diff --git a/packages/meta/nylon-feed.bb b/packages/meta/nylon-feed.bb
index cac48d56b1..9ecd2b92f1 100644
--- a/packages/meta/nylon-feed.bb
+++ b/packages/meta/nylon-feed.bb
@@ -4,6 +4,7 @@ bash \
 bridge-utils \
 busybox \
 chillispot \
+dash \
 db3 \
 ddclient \
 dhcp-forwarder \
@@ -76,6 +77,7 @@ usbutils \
 vtun \
 wireless-tools \
 wlan-ng-modules \
+yamonenv \
 zlib \
 "
 
diff --git a/packages/meta/nylon-image-base.bb b/packages/meta/nylon-image-base.bb
index 742ce0db74..dbcd9a91eb 100644
--- a/packages/meta/nylon-image-base.bb
+++ b/packages/meta/nylon-image-base.bb
@@ -7,7 +7,7 @@ NYLON_BASE = "base-files base-passwd bash busybox \
 	openssh sysvinit \
 	timezones tinylogin"
 
-DEPENDS = "virtual/kernel \ 
+DEPENDS = "virtual/kernel \
 	${NYLON_BASE} ${BOOTSTRAP_EXTRA_DEPENDS}"
 	
 RDEPENDS = "kernel modutils-depmod modutils-modinfo \
diff --git a/packages/meta/nylon-image-standard.bb b/packages/meta/nylon-image-standard.bb
index 1cd0853678..9b712ba358 100644
--- a/packages/meta/nylon-image-standard.bb
+++ b/packages/meta/nylon-image-standard.bb
@@ -18,7 +18,7 @@ NYLON_STANDARD = "\
 	usbutils \
 	wireless-tools"
 
-DEPENDS += "hostap-modules ntp \ 
+DEPENDS += "hostap-modules ntp \
 	${NYLON_STANDARD}"
 	
 RDEPENDS += "hostap-modules-pci ntpdate \