merge of 1fd96e7d233a7113f1bee08df16d96bcff4340b1

     and b4a513218154eb17b59ed896ac7e0037ab11fc14

14 files changed, 215 insertions, 269 deletions

diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index e4d7616510..ec10cd5e4e 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -12,7 +12,6 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge"
 GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
 
 include conf/machine/include/handheld-common.conf
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index e502a12dc2..0c432ad674 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -24,7 +24,6 @@ include conf/machine/include/ipaq-common.conf
 include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim" 
 GPE_EXTRA_INSTALL += "gaim"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index abcf9d2de7..bcad9ccbe0 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -16,7 +16,6 @@ TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
 IMAGE_FSTYPE = "ext2"
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser abiword"
 GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword"
 
 #BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 7b9a24ba0c..d022d8703a 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -11,7 +11,6 @@ XSERVER = "xserver-kdrive-omap"
 
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib"
 GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 30444c1533..eb44107ecd 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -37,7 +37,6 @@ USE_DEVFS = "1"
 GUI_MACHINE_CLASS = "bigscreen"
 ROOT_FLASH_SIZE = "24"
 USE_VT = "0"
-GPE_EXTRA_DEPENDS += "gaim sylpheed suspend-desktop"
 GPE_EXTRA_INSTALL += "gaim sylpheed suspend-desktop"
 
 include conf/machine/include/handheld-common.conf
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index a4bdba8675..b573f5721d 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -15,7 +15,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE
 EXTRA_IMAGEDEPENDS += "zaurus-updater"
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim"
+GPE_EXTRA_INSTALL += "gaim"
 ROOT_FLASH_SIZE = "28"
 
 include conf/machine/include/handheld-common.conf
diff --git a/packages/meta/gpe-image-blank-user.bb b/packages/meta/gpe-image-blank-user.bb
index 1400bde3f1..c8e24ae035 100644
--- a/packages/meta/gpe-image-blank-user.bb
+++ b/packages/meta/gpe-image-blank-user.bb
@@ -1,25 +1,9 @@
-include gpe-collections.bb
+include gpe-image.bb
 
 MAINTAINER = "Rob Taylor <rjt@cambridgebroadband.com"
 
-PR = "r4"
+PR = "r5"
 
 export IMAGE_BASENAME = "gpe-image-blank-user"
 
-DEPENDS = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} ${GPE_PIM} \
-	   ${GPE_BASE_SETTINGS} ${GPE_BASE_APPS} \
-	   ${GPE_EXTRA_DEPENDS}"
-
-export IPKG_INSTALL = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} \
-           	       ${GPE_PIM} ${GPE_BASE_SETTINGS} \
-	               ${GPE_BASE_APPS} ${GPE_EXTRA_DEPENDS} \
-		       ${XSERVER} \
-		       ${GPE_BASE_RDEPENDS} \
-		       ${GPE_EXTRA_INSTALL}"
-
-
 ROOTFS_POSTPROCESS_COMMAND += "adduser -D user"
-
-
-inherit image_ipk
-LICENSE = MIT
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 572eef2230..a53c4d4dc0 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -8,44 +8,31 @@ PR = "r19"
 
 export IMAGE_BASENAME = "gpe-image"
 
-GUI_MACHINE_CLASS ?= "none"
-
-GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}"
-GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
-
 GPE_EXTRA_THEMES = "gpe-theme-industrial"
 
-GPE_EXTRA_DEPENDS_bigscreen = "${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_none = ""
 GPE_EXTRA_INSTALL_bigscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
-
-GPE_EXTRA_DEPENDS_smallscreen = "${GPE_EXTRA_THEMES}"
 GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
 
-#ship more stuff with devices with >16MB of flash
-GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
-        gpe-theme-clearlooks \
-        figment \
-",d)}'
-
+GUI_MACHINE_CLASS ?= "none"
+GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 
+#ship more stuff with devices with >16MB of flash
 GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
-		gpe-task-connectivity \
-		${GPE_BIGFLASH_DEPENDS} \
+    gpe-task-connectivity \
+    gpe-theme-clearlooks \
+    figment \		
 ",d)}'
 
-GPE_EXTRA_DEPENDS += ${GPE_BIGFLASH_DEPENDS}
 GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL}
 
-GPE_EXTRA_DEPENDS_none = ""
-GPE_EXTRA_INSTALL_none = ""
-
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap \
-           meta-gpe \
-           ${GPE_EXTRA_DEPENDS}"
+DEPENDS = "task-bootstrap task-gpe"
+RDEPENDS = "${IPKG_INSTALL}"
 
-RDEPENDS = "\
+export IPKG_INSTALL = "\
+    task-bootstrap \
     gpe-task-base \
     gpe-task-pim \
     gpe-task-settings \
@@ -53,12 +40,6 @@ RDEPENDS = "\
     ${XSERVER} \
     ${GPE_EXTRA_INSTALL}"
 
-export IPKG_INSTALL = "task-bootstrap gpe-task-base \
-           	       gpe-task-pim gpe-task-settings \
-	               gpe-task-apps ${GPE_EXTRA_DEPENDS} \
-		       ${XSERVER} \
-		       ${GPE_EXTRA_INSTALL}"
-
 #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb
index 1e8c219929..cd9b132b7c 100644
--- a/packages/meta/meta-gpe-extras.bb
+++ b/packages/meta/meta-gpe-extras.bb
@@ -1,27 +1,17 @@
-PACKAGES = gpe-task-apps-extra gpe-task-games gpe-task-web gpe-task-desktopapps
 DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR="r1"
+LICENSE = MIT
+PR="r2"
 
 ALLOW_EMPTY = 1
+BUILD_ALL_DEPS = "1"
 
-RDEPENDS_gpe-task-apps-extra := "\
-    gpe-filemanager \
-    gpe-nmf \
-    gpe-soundbite \
-    mbmerlin"
+DEPENDS = "task-gpe"
 
-RDEPENDS_gpe-task-web := "\
-    gpe-irc \
-    minimo \
-    gaim"
+RDEPENDS = "\
+    gpe-task-apps-extra \
+    gpe-task-games \
+    gpe-task-web \
+    gpe-task-desktopapps"
 
-RDEPENDS_gpe-task-desktopapps := "\
-    firefox \
-    thunderbird \
-    galculator \
-    gnumeric \
-    gpdf \
-    totem"
 
-LICENSE = MIT
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index 347608aaa1..d12621ad65 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,98 +1,18 @@
-PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-connectivity
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r41"
+LICENSE = "MIT"
+PR = "r42"
 
 ALLOW_EMPTY = "1"
-
-RDEPENDS_gpe-base-depends := "\
-    diet-x11 \
-    virtual/xserver"
-
-RDEPENDS_gpe-task-base := "\
-    gpe-bootsplash \
-    bluez-utils-dbus \
-    matchbox \
-    xcursor-transparent-theme \
-    rxvt-unicode \
-    gtk2-theme-angelistic \
-    matchbox-themes-gtk \
-    xst \
-    xhost \
-    xrdb \
-    gpe-soundserver \
-    ttf-bitstream-vera \
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    libgtkstylus \
-    detect-stylus \
-    suspend-desktop \
-    teleport \
-    xauth \
-    gdk-pixbuf-loader-png \
-    gdk-pixbuf-loader-xpm \
-    gdk-pixbuf-loader-jpeg \
-    pango-module-basic-x \
-    pango-module-basic-fc"
-
-RDEPENDS_gpe-task-pim := "\
-    gpe-timesheet \
-    gpe-todo \
-    gpe-calendar \
-    gpe-sketchbook \
-    gpe-contacts \
-    gpe-today \
-    gpesyncd"
-
-RDEPENDS_gpe-task-settings := "\
-    matchbox-panel-manager \
-    gpe-bluetooth \
-    gpe-beam \
-    gpe-su \
-    gpe-conf \
-    gpe-clock \
-    gpe-mininet \
-    gpe-mixer \
-    gpe-package \
-    gpe-shield \
-    gpe-taskmanager \
-    keylaunch \
-    minilite \
-    minimix \
-    xmonobut"
-
-RDEPENDS_gpe-task-apps := "\
-    gpe-edit \
-    gpe-gallery \
-    gpe-calculator \
-    gpe-clock \
-    gpe-plucker \
-    gpe-terminal \
-    gpe-watch \
-    gpe-what \
-    matchbox-panel-hacks \
-    gpe-aerial \
-    gpe-soundbite \
-    rosetta"
-
-RDEPENDS_gpe-task-games := "\
-    gpe-go \
-    gpe-lights \
-    gpe-othello \
-    gpe-tetris \
-    gsoko \
-    xdemineur"
-
-RDEPENDS_gpe-task-connectivity := "\
-    gpe-mini-browser"
-#    gaim
-#    linphone-hh
-
-# FIXME - Some dependencies are broken somewhere for this to be needed
-DEPENDS += "matchbox-themes-extra"
-
-LICENSE = "MIT"
+BUILD_ALL_DEPS = "1"
+
+DEPENDS = "task-gpe"
+
+RDEPENDS = "\
+    gpe-base-depends \
+    gpe-task-base \
+    gpe-task-settings \
+    gpe-task-pim \
+    gpe-task-apps \
+    gpe-task-games \
+    gpe-task-connectivity"
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index 01bd572730..b0f32412d8 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -1,82 +1,17 @@
-PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim sectest-task-apps gpe-task-games 
 DESCRIPTION = "Meta-package for GPE Security Testing Image"
 MAINTAINER = "Bob Davies tyggerbob@rogers.com>"
-PR = "r5"
+LICENSE = "MIT"
+PR = "r6"
 
 ALLOW_EMPTY = "1"
+BUILD_ALL_DEPS = "1"
 
-RDEPENDS_gpe-base-depends := "\
-    diet-x11 \
-    virtual/xserver"
-
-RDEPENDS_gpe-task-base := "\
-    bluez-utils-dbus \
-    matchbox \
-    xcursor-transparent-theme \
-    rxvt-unicode \
-    gtk2-theme-angelistic \
-    xst \
-    xhost \
-    xrdb \
-    gpe-soundserver \
-    ttf-bitstream-vera \
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    libgtkstylus \
-    detect-stylus \
-    gdk-pixbuf-loader-png \
-    gdk-pixbuf-loader-xpm \
-    gdk-pixbuf-loader-jpeg \
-    pango-module-basic-x \
-    pango-module-basic-fc"
-
-RDEPENDS_gpe-task-pim := "\
-    figment"
-
-RDEPENDS_gpe-task-settings := "\
-    matchbox-panel-manager \
-    gpe-bluetooth \
-    gpe-beam \
-    gpe-su \
-    gpe-conf \
-    gpe-clock \
-    gpe-mininet \
-    gpe-mixer \
-    gpe-package \
-    gpe-shield \
-    gpe-taskmanager \
-    keylaunch \
-    minilite \
-    xmonobut"
+DEPENDS = "task-gpe"
 
-RDEPENDS_sectest-task-apps := "\
-    gpe-edit \
-    gpe-calculator \
-    gpe-clock \
-    gpe-terminal \
-    gpe-watch \
-    gpe-what \
-    matchbox-panel-hacks \
-    gpe-aerial \
-    mbmerlin \
-    nmap \
-    ettercap \
-    stunnel \
-    curl \
-    dsniff \
-    prismstumbler \
-    tcpdump \
-    kismet \
-    hydra \
-    thcrut \
-    driftnet \
-    miniclipboard"
-
-# FIXME - we shouldn't need this. which packages don't set their dependencies correctly?
-DEPENDS += "matchbox-themes-extra gtk-industrial-engine"
-
-LICENSE = "MIT"
+RDEPENDS = "\
+    gpe-task-base \
+    gpe-base-depends \
+    gpe-task-base \
+    gpe-task-settings \
+    gpe-task-pim \
+    gpe-task-sectest"
diff --git a/packages/meta/sectest-gpe-image.bb b/packages/meta/sectest-gpe-image.bb
index 0d1dbfbcbb..39109245f1 100644
--- a/packages/meta/sectest-gpe-image.bb
+++ b/packages/meta/sectest-gpe-image.bb
@@ -1,45 +1,43 @@
 MAINTAINER = "Bob Davies  <tyggerbob@rogers.com>"
+LICENSE = MIT
+PR = "r5"
+
 FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
 
-PR = "r5"
-
 export IMAGE_BASENAME = "sectest-gpe-image"
 
-GUI_MACHINE_CLASS ?= "none"
-
-GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}"
-GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
-
-GPE_EXTRA_THEMES = "gtk-theme-industrial gtk-industrial-engine matchbox-themes-extra-industrial"
-
-#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_THEMES = "\
+    gtk-theme-industrial \
+    gtk-industrial-engine \
+    matchbox-themes-extra-industrial"
 
-GPE_EXTRA_DEPENDS_smallscreen = ""
+GPE_EXTRA_INSTALL_none = ""
 GPE_EXTRA_INSTALL_smallscreen = "${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_bigscreen = "minimo gpe-task-games ${GPE_EXTRA_THEMES}"
+#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
 
-GPE_EXTRA_DEPENDS_none = ""
-GPE_EXTRA_INSTALL_none = ""
+GUI_MACHINE_CLASS ?= "none"
+GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap \
-	   meta-sectest-gpe \
-	   ${GPE_EXTRA_DEPENDS}"
+DEPENDS = "task-bootstrap task-gpe"
+RDEPENDS = "${IPKG_INSTALL}"
 
-export IPKG_INSTALL = "task-bootstrap gpe-task-base \
-           	       gpe-task-pim gpe-task-settings \
-	               sectest-task-apps ${GPE_EXTRA_DEPENDS} \
-		       ${XSERVER} \
-		       ${GPE_EXTRA_INSTALL}"
+export IPKG_INSTALL = "\
+    task-bootstrap \
+    gpe-task-base \
+    gpe-task-pim \
+    gpe-task-settings \
+    gpe-task-sectest \
+    ${XSERVER} \
+    ${GPE_EXTRA_INSTALL}"
 
 ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
-LICENSE = MIT
+
diff --git a/packages/meta/task-gpe.bb b/packages/meta/task-gpe.bb
new file mode 100644
index 0000000000..49a456161c
--- /dev/null
+++ b/packages/meta/task-gpe.bb
@@ -0,0 +1,139 @@
+DESCRIPTION = "Task packages for GPE Palmtop Environment"
+PR = "r0"
+LICENSE = MIT
+ALLOW_EMPTY = "1"
+
+PACKAGES = "\
+    gpe-base-depends \
+    gpe-task-base \
+    gpe-task-settings \
+    gpe-task-pim \
+    gpe-task-apps \
+    gpe-task-games \ 
+    gpe-task-connectivity \
+    gpe-task-apps-extra \
+    gpe-task-games \
+    gpe-task-web \
+    gpe-task-desktopapps \
+    gpe-task-sectest"
+
+RDEPENDS_gpe-base-depends := "\
+    diet-x11 \
+    virtual/xserver"
+
+RDEPENDS_gpe-task-base := "\
+    gpe-bootsplash \
+    bluez-utils-dbus \
+    matchbox \
+    xcursor-transparent-theme \
+    rxvt-unicode \
+    gtk2-theme-angelistic \
+    matchbox-themes-gtk \
+    xst \
+    xhost \
+    xrdb \
+    gpe-soundserver \
+    ttf-bitstream-vera \
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    libgtkstylus \
+    detect-stylus \
+    suspend-desktop \
+    teleport \
+    xauth \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc"
+
+RDEPENDS_gpe-task-pim := "\
+    gpe-timesheet \
+    gpe-todo \
+    gpe-calendar \
+    gpe-sketchbook \
+    gpe-contacts \
+    gpe-today \
+    gpesyncd"
+
+RDEPENDS_gpe-task-settings := "\
+    matchbox-panel-manager \
+    gpe-bluetooth \
+    gpe-beam \
+    gpe-su \
+    gpe-conf \
+    gpe-clock \
+    gpe-mininet \
+    gpe-mixer \
+    gpe-package \
+    gpe-shield \
+    gpe-taskmanager \
+    keylaunch \
+    minilite \
+    minimix \
+    xmonobut"
+
+RDEPENDS_gpe-task-apps := "\
+    gpe-edit \
+    gpe-gallery \
+    gpe-calculator \
+    gpe-clock \
+    gpe-plucker \
+    gpe-terminal \
+    gpe-watch \
+    gpe-what \
+    matchbox-panel-hacks \
+    gpe-aerial \
+    gpe-soundbite \
+    rosetta"
+
+RDEPENDS_gpe-task-games := "\
+    gpe-go \
+    gpe-lights \
+    gpe-othello \
+    gpe-tetris \
+    gsoko \
+    xdemineur"
+
+RDEPENDS_gpe-task-connectivity := "\
+    gpe-mini-browser"
+#    gaim
+#    linphone-hh
+
+RDEPENDS_gpe-task-apps-extra := "\
+    gpe-filemanager \
+    gpe-nmf \
+    gpe-soundbite \
+    mbmerlin"
+
+RDEPENDS_gpe-task-web := "\
+    gpe-irc \
+    minimo \
+    gaim"
+
+RDEPENDS_gpe-task-desktopapps := "\
+    firefox \
+    thunderbird \
+    galculator \
+    gnumeric \
+    gpdf \
+    totem"
+
+RDEPENDS_gpe-task-sectest := "\
+    mbmerlin \
+    nmap \
+    ettercap \
+    stunnel \
+    curl \
+    dsniff \
+    prismstumbler \
+    tcpdump \
+    kismet \
+    hydra \
+    thcrut \
+    driftnet \
+    miniclipboard"
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index 92915bf872..43d9d0c14a 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -6,10 +6,14 @@ terminal emulator rxvt, modified to store text in Unicode \
 output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
 LICENSE = "GPL"
+PACKAGES =+ "${PN}-daemon ${PN}-control"
+FILES_${PN}-daemon = "${bindir}/rxvtd"
+FILES_${PN}-control = "${bindir}/rxvtc"
+
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
 	   file://xwc.patch;patch=1 \
 	   file://signedchar.patch;patch=1"
-PR = "r2"
+PR = "r3"
 
 inherit autotools update-alternatives