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

into gandalf.tm.informatik.uni-frankfurt.de:/home/pb_/packages

2004/06/12 00:16:47+02:00 uni-frankfurt.de!pb_
tweak gpe metapackages

BKrev: 40ca2f555Rxf5P6-S7Dwr_x-C8vwdA

diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 194a2f5..6998873 100644 (file)
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -5,7 +5,7 @@ DEPENDS = 'task-bootstrap \
           meta-gpe ttf-bitstream-vera'
 
 export IPKG_INSTALL = 'task-bootstrap xserver-kdrive-fbdev \
-                     gpe ttf-bitstream-vera pango-module-basic-xft \
+                     gpe ttf-bitstream-vera pango-module-basic-x pango-module-basic-fc \
                      glibc-gconv glibc-gconv-iso8859-1 gdk-pixbuf-loader-png'
 
 inherit image_ipk

diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
index 488e280..5cd2804 100644 (file)
--- a/meta/meta-gpe.oe
+++ b/meta/meta-gpe.oe
@@ -13,6 +13,7 @@ gpe-base = "\
     matchbox \
     rxvt \
     gpe-icons \
+    libfontconfig-utils \
     gpe-autostarter"
 
 RDEPENDS_gpe-task-base := "${gpe-base}"
@@ -33,7 +34,10 @@ gpe-task-utils = "\
     gpe-su \
     gpe-conf \
     gpe-filemanager \
-    gpe-gallery"
+    gpe-gallery \
+    gpe-shield \
+    galculator \
+    gkdial"
 
 RDEPENDS_gpe-task-utils := "${gpe-task-utils}"
 DEPENDS += " ${gpe-task-utils}"