Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded

into home.(none):/home/bitkeeper/openembedded

2005/05/13 23:24:15-07:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/13 23:11:16+02:00 handhelds.org!zecke
libsdl-qpe:
	Patch by Gints Polis to fix the rotation for h38xx iPAQ
	models.

2005/05/13 22:38:41+02:00 handhelds.org!zecke
Qt 2.3.10:
	Patch Qt to support Right To Left scripting of text.
	Patch is courtsey ALynch, the Makefile.in changes are
	done by myself

2005/05/13 12:27:57+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded

2005/05/13 12:27:36+02:00 hrw.one.pl!hrw
added opie-icon-reload to opie-image - it is small and usefull

2005/05/13 12:13:04+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/13 12:12:52+02:00 uni-frankfurt.de!mickeyl
apply the libqpe fix-titleheight patch for the cvs version as well, since I feel uncomfortable pushing it upstream

2005/05/13 11:36:47+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded

2005/05/13 11:33:38+02:00 hrw.one.pl!hrw
opie-calculator: add files from etc/ to get unit conversations work - patch by Gints Polis

2005/05/13 10:25:00+01:00 rpsys.net!RP
bump

2005/05/13 10:22:43+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded

2005/05/13 10:12:15+01:00 rpsys.net!RP
linux-oz-2.6: Fix suspend/resume issue + add mmc timeout fix

2005/05/13 01:12:31+02:00 uni-frankfurt.de!mickeyl
add pcmciautils 003

2005/05/13 00:45:29+02:00 uni-frankfurt.de!mickeyl
add infrared and ppp modules to c7x0 bootstrap image (kernel 2.6)

2005/05/13 00:23:22+02:00 uni-frankfurt.de!mickeyl
remove meta-grant and gpe-image-grant: please don't commit private .bb files

2005/05/13 00:11:21+02:00 uni-frankfurt.de!mickeyl
spectrum_cs: catch up with linux 2.6.12

2005/05/12 23:54:13+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/12 23:45:30+02:00 uni-frankfurt.de!mickeyl
remove opie-mobilemsg, it has been removed upstream also

2005/05/12 23:09:32+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/05/12 23:08:58+02:00 utwente.nl!koen
Add kanatest_0.3.6.bb, kanatest.inc, kanatest.desktop, courtesy Robert Marcano

2005/05/12 20:32:38+01:00 nexus.co.uk!pb
new xinerama snapshot


2005/05/12 20:30:35+01:00 nexus.co.uk!pb
use linux-core directory instead of linux

2005/05/12 20:29:34+01:00 nexus.co.uk!pb
update xserver-xorg to 6.8.99.5


2005/05/12 20:27:09+01:00 nexus.co.uk!pb
update mythtv to 0.17


2005/05/12 20:26:18+01:00 nexus.co.uk!pb
correct "--enablee" typo in mythtv_0.16


2005/05/12 20:20:30+01:00 nexus.co.uk!pb
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mill.nexus.co.uk:/nexus/home/pb/oe/oe

2005/05/09 09:10:48+01:00 nexus.co.uk!pb
add CELF busybox patch for more ash builtins

BKrev: 42859a7e_yqKTfUGEQQRWFA_fBpqQQ

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"