Merge bk://openembedded@openembedded.bkbits.net/packages

into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/09/19 22:00:25+01:00 (none)!cwiiis
Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages

2004/09/19 20:46:28+01:00 (none)!cwiiis
Fix silly errors in gpe-collections/gpe-image - Builds fine again.

BKrev: 414e0600AAnQt7mntpy6_42GqJFhBQ

diff --git a/meta/gpe-collections.oe b/meta/gpe-collections.oe
index 89a4810..52b03fd 100644 (file)
--- a/meta/gpe-collections.oe
+++ b/meta/gpe-collections.oe
@@ -13,10 +13,10 @@ GPE_BASE_DEPENDS = "\
     xprop \
     xhost \
     xrdb \
-    gpe-soundserver"
+    gpe-soundserver \
+    ttf-bitstream-vera"
 
 GPE_BASE_RDEPENDS = "\
-    ttf-bitstream-vera \
     glibc-gconv \
     glibc-gconv-iso8859-1 \
     gdk-pixbuf-loader-png \
@@ -84,3 +84,5 @@ GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh"
 
 GPE_EXTRA_DEPENDS_none = ""
 GPE_EXTRA_INSTALL_none = ""
+
+XSERVER ?= "xserver-kdrive-fbdev"

diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index b389589..9417c7e 100644 (file)
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -1,6 +1,8 @@
 include gpe-collections.oe
 
-PR = "r3"
+MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
+
+PR = "r4"
 
 export IMAGE_BASENAME = "gpe-image"
 
@@ -8,8 +10,6 @@ DEPENDS = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} ${GPE_PIM} \
           ${GPE_BASE_SETTINGS} ${GPE_BASE_APPS} \
           ${GPE_EXTRA_DEPENDS}"
 
-XSERVER ?= "xserver-kdrive-fbdev"
-
 export IPKG_INSTALL = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} \
                       ${GPE_PIM} ${GPE_BASE_SETTINGS} \
                       ${GPE_BASE_APPS} ${GPE_EXTRA_DEPENDS} \