summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2005-08-19 10:44:55 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-19 10:44:55 +0000
commit7203552a097c7429519f89ed179f241496cf6394 (patch)
treeb9d6e855eb747f29a4d0e3fa010ffde50512cf07 /conf
parent225ba4c1050268ba2ded658ac0bb3118614d9151 (diff)
parentcb4c8d46b4a02c644695f3d818362d66f463de01 (diff)
merge of 7a93d384016e8e1ae79f574d3c804e0a38a222e7
and 845f932890628e6c650909f15f2585f2b763ace8
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/maemo-preferred.inc3
-rw-r--r--conf/machine/netvista.conf4
2 files changed, 5 insertions, 2 deletions
diff --git a/conf/distro/maemo-preferred.inc b/conf/distro/maemo-preferred.inc
index 9c087f3b3c..943f244326 100644
--- a/conf/distro/maemo-preferred.inc
+++ b/conf/distro/maemo-preferred.inc
@@ -4,4 +4,7 @@ PREFERRED_VERSION_dbus = "0.23.1-osso5"
PREFERRED_VERSION_audiofile = "0.2.6-3osso4"
PREFERRED_PROVIDER_esd = "osso-esd"
PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7"
+PREFERRED_VERSION_glib-2.0 = "2.6.4"
+PREFERRED_VERSION_pango = "1.8.1"
+PREFERRED_VERSION_atk = "1.9.0"
PREFERRED_VERSION_diet-x11 ?= "6.2.1" \ No newline at end of file
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index fc61ba4f6a..30223a485d 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -17,8 +17,8 @@ TARGET_VENDOR = "-oe"
PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
IMAGE_FSTYPE = "ext2"
GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser"
-GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser"
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser abiword"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword"
#BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
#BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace