4 files changed, 2 insertions, 103 deletions
diff --git a/packages/meta/grant-image.bb b/packages/meta/grant-image.bb
deleted file mode 100644
index 9ddb6c117f..0000000000
--- a/packages/meta/grant-image.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-
-MAINTAINER = "Jeremy Grant <jeremy@thegrantclan.org>"
-
-PR = "r1"
-
-export IMAGE_BASENAME = "grant-image"
-
-GRANT_MACHINE_CLASS ?= "none"
-
-XSERVER ?= "xserver-kdrive-fbdev"
-
-DEPENDS = "task-bootstrap \
-	   meta-grant \
-	   ${GRANT_EXTRA_DEPENDS}"
-
-export IPKG_INSTALL = "task-bootstrap \
-	               ${GPE_EXTRA_DEPENDS} \
-		       ${XSERVER} "
-
-ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
-
-inherit image_ipk
-LICENSE = MIT
diff --git a/packages/meta/meta-grant.bb b/packages/meta/meta-grant.bb
deleted file mode 100644
index 79ab6cfdcb..0000000000
--- a/packages/meta/meta-grant.bb
+++ /dev/null
@@ -1,78 +0,0 @@
-PACKAGES = grant-base-depends grant-task-base grant-task-settings grant-task-apps
-DESCRIPTION = "Meta-package for Grant Palmtop Environment(Based on GPE)"
-MAINTAINER = "Jeremy Grant <jeremy@thegrantclan.org>"
-PR = "r1"
-
-ALLOW_EMPTY = 1
-
-grant-base-depends = "\
-    diet-x11 \
-    virtual/xserver"
-
-RDEPENDS_grant-base-depends := "${grant-base-depends}"
-DEPENDS += " ${grant-base-depends}"
-
-grant-task-base = "\
-    matchbox \
-    xcursor-transparent-theme \
-    rxvt-unicode \
-    gtk2-theme-angelistic \
-    xst \
-    xprop \
-    xhost \
-    xrdb \
-    gpe-soundserver \
-    ttf-bitstream-vera \
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    gpe-bootsplash \
-    libgtkstylus \
-    detect-stylus"
-
-RDEPENDS_grant-task-base := "glibc-gconv \
-			   glibc-gconv-iso8859-1 \
-			   gdk-pixbuf-loader-png \
-			   gdk-pixbuf-loader-xpm \
-			   gdk-pixbuf-loader-jpeg \
-			   pango-module-basic-x \
-			   pango-module-basic-fc \
-			   ${gpe-task-base}"
-DEPENDS += " ${grant-task-base}"
-
-grant-task-settings = "\
-    matchbox-panel-manager \
-    gpe-bluetooth \
-    gpe-su \
-    gpe-conf \
-    gpe-clock \
-    gpe-mininet \
-    gpe-mixer \
-    gpe-shield \
-    gpe-wlancfg \
-    gpe-taskmanager \
-    keylaunch \
-    minilite \
-    xmonobut"
-
-RDEPENDS_grant-task-settings := "${grant-task-settings}"
-DEPENDS += " ${grant-task-settings}"
-
-grant-task-apps = "\
-    gpe-calculator \
-    gpe-package \
-    gpe-terminal \
-    gpe-watch \
-    matchbox-panel-hacks \
-    rosetta \
-	 bash \
-	 bitchx \
-	 sudo \
-	 vim"
-
-RDEPENDS_grant-task-apps := "${grant-task-apps}"
-DEPENDS += " ${grant-task-apps}"
-LICENSE = MIT
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 05095abd8f..81402c225f 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -87,7 +87,6 @@ opie-gutenbrowser \
 opie-helpbrowser \
 opie-irc \
 opie-keypebble \
-opie-mobilemsg \
 opie-odict \
 opie-oxygen \
 opie-rdesktop \
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 8d8c7e7130..bb39694983 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -47,7 +47,8 @@ OPIE_BASE_APPS = "opie-packagemanager opie-keytabs opie-console opie-clock \
                   opie-citytime opie-backup"
 
 OPIE_BASE_SETTINGS = "opie-light-and-power opie-appearance opie-systemtime \
-                      opie-sysinfo opie-networksettings opie-button-settings"
+                      opie-sysinfo opie-networksettings opie-button-settings \
+					  opie-icon-reload"
 
 OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"