Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/24 02:33:48+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/02/24 02:33:16+00:00 (none)!cwiiis
Update user-own-collie-devs patch for gpe-login.

2005/02/24 02:21:03+00:00 (none)!cwiiis
Use user-own-collie-devs patch in gpe-login again.

2005/02/23 19:50:06-06:00 ti.com!kergoth
Add OpenOMAP, a simple OE built distribution for TI OMAP development platforms.

2005/02/23 19:46:00-06:00 ti.com!kergoth
Set MODUTILS = '26' in the omap1610h2.conf, since the only omap kernel we've got is 2.6 anyway.

2005/02/24 01:40:43+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/02/23 19:40:28-06:00 ti.com!kergoth
gnupg2: kill the unnecessary do_install docdir rearranging, add /usr/share/gnupg to FILES_PN.

2005/02/24 01:39:57+00:00 (none)!cwiiis
Make keylaunch use custom keylaunchrc (empty for collie, otherwise default).

2005/02/24 01:17:28+00:00 (none)!cwiiis
Use update-alternatives and custom kbdconfig in matchbox svn as well.

2005/02/23 16:21:10+00:00 (none)!cwiiis
Make gpe-appmgr only install on the gpe-image of bigscreen devices.

2005/02/23 16:14:27+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/02/23 13:38:49+00:00 (none)!cwiiis
Merge

2005/02/23 12:41:55+00:00 (none)!cwiiis
Move loading of libgtkstylus to Xsession.d from profile.d.

2005/02/23 12:34:56+00:00 (none)!cwiiis
Remove apm_bios patch and make Xsession more debian-like (source all scripts) in gpe-dm.

2005/02/23 12:33:12+00:00 (none)!cwiiis
Add keysym for power button on collie for X

2005/02/22 10:44:46+00:00 (none)!cwiiis
Merge matchbox-wm changes, and make use update-alternatives class.

2005/02/22 02:52:05+00:00 (none)!cwiiis
Use custom kbdconfig with matchbox-wm (for simpad and collie)

2005/02/18 22:36:53+00:00 (none)!cwiiis
Add --with-env-editor switch to configure of sudo

2005/02/18 22:35:54+00:00 (none)!cwiiis
Really get rid of the apm_bios removal patch for collie...

2005/02/18 22:33:47+00:00 (none)!cwiiis
-Update gpe-login patch to set ownership of devices
-Remove patch that deletes /dev/apm_bios for collie - no longer necessary

BKrev: 421d3e9bcU67BQXgiWhQfs1uU1AqSg

2 files changed, 4 insertions, 5 deletions

diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 8bf03689df..ed54d71177 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -4,7 +4,7 @@ FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${D
                                 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 = "r11"
+PR = "r12"
 
 export IMAGE_BASENAME = "gpe-image"
 
@@ -18,7 +18,7 @@ GPE_EXTRA_THEMES = "gtk-theme-industrial matchbox-themes-extra-industrial"
 #GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
 #GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
 GPE_EXTRA_DEPENDS_bigscreen = "minimo figment"
-GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES} gpe-appmgr"
 
 GPE_EXTRA_DEPENDS_smallscreen = "minimo figment linphone-hh"
 GPE_EXTRA_INSTALL_smallscreen = "minimo figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}"
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index bb02c26c9d..3c1bce49d2 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 = "r35"
+PR = "r36"
 
 ALLOW_EMPTY = 1
 
@@ -31,7 +31,6 @@ gpe-task-base = "\
     gpe-autostarter \
     gpe-bootsplash \
     libgtkstylus \
-    gpe-appmgr \
     detect-stylus \
     teleport \	
     xauth"
@@ -101,6 +100,6 @@ gpe-task-games = "\
 RDEPENDS_gpe-task-games := "${gpe-task-games}"
 DEPENDS += " ${gpe-task-games}"
 
-DEPENDS += "matchbox-themes-extra"
+DEPENDS += "gpe-appmgr matchbox-themes-extra"
 
 LICENSE = MIT