summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2004-06-11 22:16:53 +0000
committerPhil Blundell <philb@gnu.org>2004-06-11 22:16:53 +0000
commit1d271449186e8e0b71274370fb2942975e2591db (patch)
treec63921152ad30bde048ac9f74403c881d66be0f7
parentc64f179753630bbc2a692cefdb3111d007b8639a (diff)
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
-rw-r--r--meta/gpe-image.oe2
-rw-r--r--meta/meta-gpe.oe6
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 194a2f5f25..6998873f66 100644
--- 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 488e280d8b..5cd280426c 100644
--- 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}"