summaryrefslogtreecommitdiff
path: root/openembedded/conf/distro
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-10-10 10:41:35 +0000
committerRichard Purdie <richard@openedhand.com>2005-10-10 10:41:35 +0000
commitcbf3ef91305558fb8a59e19c5987a9e9ca22013a (patch)
treef7142e57734a8b2fac92ff758a6617d4464a82f9 /openembedded/conf/distro
parent562d4d35878bb644cbe2b9f23ef407fd6e1e38e2 (diff)
downloadopenembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.gz
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.bz2
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.xz
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.zip
Merge changes from mainline OE to try and keep us in sync.
git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/distro')
-rw-r--r--openembedded/conf/distro/maemo-1.0.conf2
-rw-r--r--openembedded/conf/distro/preferred-gpe-versions-2.6.inc86
2 files changed, 1 insertions, 87 deletions
diff --git a/openembedded/conf/distro/maemo-1.0.conf b/openembedded/conf/distro/maemo-1.0.conf
index f8211dc3c..15ec45f34 100644
--- a/openembedded/conf/distro/maemo-1.0.conf
+++ b/openembedded/conf/distro/maemo-1.0.conf
@@ -28,7 +28,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
#
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-#PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
PREFERRED_PROVIDER_x11 = "diet-x11"
include conf/distro/preferred-gpe-versions.inc
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.6.inc b/openembedded/conf/distro/preferred-gpe-versions-2.6.inc
deleted file mode 100644
index 504d495c1..000000000
--- a/openembedded/conf/distro/preferred-gpe-versions-2.6.inc
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Specify which versions of GPE (and related) applications to build
-#
-
-#work around some breakages
-CVSDATE_xserver-kdrive=20050207
-CVSDATE_minimo=20050401
-CVSDATE_cairo=20050330
-CVSDATE_xext=20050222
-
-#set some preferred providers:
-#PREFERRED_PROVIDER_gconf=gconf-dbus
-
-#specify versions, as the header says :)
-PREFERRED_VERSION_libmatchbox ?= "1.6"
-PREFERRED_VERSION_matchbox ?= "0.9.1"
-PREFERRED_VERSION_matchbox-common ?= "0.9.1"
-PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
-PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
-PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
-PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
-PREFERRED_VERSION_gtk+ ?= "2.6.3"
-PREFERRED_VERSION_libgpewidget ?= "0.97"
-PREFERRED_VERSION_libgpepimc ?= "0.4"
-PREFERRED_VERSION_libgpevtype ?= "0.11"
-PREFERRED_VERSION_libschedule ?= "0.14"
-PREFERRED_VERSION_gpe-icons ?= "0.24"
-PREFERRED_VERSION_libgsm ?= "1.0.10"
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
-PREFERRED_VERSION_xproto ?= "6.6.2"
-PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
-PREFERRED_VERSION_rxvt-unicode ?= "5.3"
-PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
-PREFERRED_VERSION_xst ?= "0.14"
-#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
-PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login ?= "0.76"
-PREFERRED_VERSION_gpe-session-scripts ?= "0.62"
-PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
-PREFERRED_VERSION_gpe-todo ?= "0.50"
-PREFERRED_VERSION_gpe-calendar ?= "0.61"
-PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
-PREFERRED_VERSION_gpe-contacts ?= "0.36"
-PREFERRED_VERSION_gpe-today ?= "0.08"
-PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
-PREFERRED_VERSION_dbus ?= "0.23"
-PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
-PREFERRED_VERSION_gpe-su ?= "0.18"
-PREFERRED_VERSION_gpe-conf ?= "0.1.23"
-PREFERRED_VERSION_gpe-clock ?= "0.20"
-PREFERRED_VERSION_gpe-mininet ?= "0.5"
-PREFERRED_VERSION_gpe-mixer ?= "0.40"
-PREFERRED_VERSION_gpe-shield ?= "0.7"
-PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager ?= "0.17"
-PREFERRED_VERSION_keylaunch ?= "2.0.7"
-PREFERRED_VERSION_minilite ?= "0.47"
-PREFERRED_VERSION_xmonobut ?= "0.4"
-PREFERRED_VERSION_gpe-edit ?= "0.28"
-PREFERRED_VERSION_gpe-gallery ?= "0.95"
-PREFERRED_VERSION_gpe-calculator ?= "0.2"
-PREFERRED_VERSION_gpe-package ?= "0.2"
-PREFERRED_VERSION_gpe-soundbite ?= "1.0.5"
-PREFERRED_VERSION_gpe-terminal ?= "1.1"
-PREFERRED_VERSION_gpe-watch ?= "0.10"
-PREFERRED_VERSION_gpe-what ?= "0.33"
-PREFERRED_VERSION_gpe-filemanager ?= "0.20"
-PREFERRED_VERSION_gpe-go ?= "0.05"
-PREFERRED_VERSION_gpe-irc ?= "0.07"
-PREFERRED_VERSION_gpe-lights ?= "0.13"
-#PREFERRED_VERSION_gpe-nmf ?= "0.19"
-PREFERRED_VERSION_gpe-othello ?= "0.2-1"
-PREFERRED_VERSION_gpe-plucker ?= "0.2"
-PREFERRED_VERSION_gpe-tetris ?= "0.6-2"
-PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
-PREFERRED_VERSION_xdemineur ?= "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
-PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
-PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
-PREFERRED_VERSION_linphone ?= "0.12.2"
-PREFERRED_VERSION_firefox ?= "1.0"
-