summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-11-03 18:26:03 +0000
committerRichard Purdie <richard@openedhand.com>2005-11-03 18:26:03 +0000
commitb265ed47d88679229368346cfef9fe0cf5ffe636 (patch)
tree6926e9f856010ace4e54f9bd17f4fe9b81046b4f
parentd910c678defeafa54c27e018922bccfd7bfc11e7 (diff)
downloadpoky-b265ed47d88679229368346cfef9fe0cf5ffe636.tar.gz
Update poky-additions and gpe-preferred-versions so everything should work after the bitbake fix
git-svn-id: https://svn.o-hand.com/repos/poky@167 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--openembedded/conf/distro/poky-additions.inc34
-rw-r--r--openembedded/conf/distro/preferred-gpe-versions-2.7.inc18
2 files changed, 28 insertions, 24 deletions
diff --git a/openembedded/conf/distro/poky-additions.inc b/openembedded/conf/distro/poky-additions.inc
index 8a1345abf1..1474aebdbf 100644
--- a/openembedded/conf/distro/poky-additions.inc
+++ b/openembedded/conf/distro/poky-additions.inc
@@ -32,21 +32,25 @@ CVSDATE_damageext = "20051101"
32CVSDATE_compositeext = "20051101" 32CVSDATE_compositeext = "20051101"
33CVSDATE_xcalibrateext = "20051101" 33CVSDATE_xcalibrateext = "20051101"
34CVSDATE_recordext = "20051101" 34CVSDATE_recordext = "20051101"
35 35CVSDATE_libfakekey = "20051101"
36 36CVSDATE_xmodmap = "20051101"
37#PREFERRED_VERSION_matchbox = "0.9.1" 37CVSDATE_xrandr = "20051101"
38#PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6" 38CVSDATE_xtst = "20051101"
39#PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1" 39CVSDATE_xcalibrate = "20051101"
40#PREFERRED_VERSION_matchbox-common = "0.9.1+cvs-${CVSDATE}" 40
41#PREFERRED_VERSION_matchbox-config-gtk = "0.0+cvs-${CVSDATE}" 41PREFERRED_VERSION_matchbox = "0.9.1"
42#PREFERRED_VERSION_matchbox-desktop = "0.9.1+cvs-${CVSDATE}" 42PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
43#PREFERRED_VERSION_matchbox-keyboard = "0.0+cvs-${CVSDATE}" 43PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
44#PREFERRED_VERSION_matchbox-panel = "0.9.2+cvs-${CVSDATE}" 44PREFERRED_VERSION_matchbox-common = "0.9.1+cvs-${CVSDATE}"
45#PREFERRED_VERSION_matchbox-panel-manager = "0.0+cvs-${CVSDATE}" 45PREFERRED_VERSION_matchbox-config-gtk = "0.0+cvs-${CVSDATE}"
46#PREFERRED_VERSION_matchbox-stroke = "0.0+cvs-${CVSDATE}" 46PREFERRED_VERSION_matchbox-desktop = "0.9.1+cvs-${CVSDATE}"
47#PREFERRED_VERSION_matchbox-themes-extra = "0.3+cvs-${CVSDATE}" 47PREFERRED_VERSION_matchbox-keyboard = "0.0+cvs-${CVSDATE}"
48#PREFERRED_VERSION_matchbox-wm = "0.9.5+cvs-${CVSDATE}" 48PREFERRED_VERSION_matchbox-panel = "0.9.2+cvs-${CVSDATE}"
49#PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}" 49PREFERRED_VERSION_matchbox-panel-manager = "0.0+cvs-${CVSDATE}"
50PREFERRED_VERSION_matchbox-stroke = "0.0+cvs-${CVSDATE}"
51PREFERRED_VERSION_matchbox-themes-extra = "0.3+cvs-${CVSDATE}"
52PREFERRED_VERSION_matchbox-wm = "0.9.5+cvs-${CVSDATE}"
53PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}"
50 54
51 55
52PREFERRED_VERSION_atk = "1.10.0" 56PREFERRED_VERSION_atk = "1.10.0"
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
index 561bc79c06..f9c96b4849 100644
--- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
@@ -10,13 +10,13 @@ CVSDATE_minimo=20050401
10PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus 10PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
11 11
12#specify versions, as the header says :) 12#specify versions, as the header says :)
13PREFERRED_VERSION_libmatchbox ?= "1.7" 13#PREFERRED_VERSION_libmatchbox ?= "1.7"
14PREFERRED_VERSION_matchbox ?= "0.9.1" 14#PREFERRED_VERSION_matchbox ?= "0.9.1"
15PREFERRED_VERSION_matchbox-common ?= "0.9.1" 15#PREFERRED_VERSION_matchbox-common ?= "0.9.1"
16PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" 16#PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
17PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}" 17#PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}"
18PREFERRED_VERSION_matchbox-panel ?= "0.9.2" 18#PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
19PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" 19#PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
20PREFERRED_VERSION_atk ?= "1.9.0" 20PREFERRED_VERSION_atk ?= "1.9.0"
21PREFERRED_VERSION_cairo ?= "0.5.2" 21PREFERRED_VERSION_cairo ?= "0.5.2"
22PREFERRED_VERSION_glib-2.0 ?= "2.6.4" 22PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
@@ -47,7 +47,7 @@ PREFERRED_VERSION_gpe-calendar ?= "0.65"
47PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" 47PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
48PREFERRED_VERSION_gpe-contacts ?= "0.42" 48PREFERRED_VERSION_gpe-contacts ?= "0.42"
49PREFERRED_VERSION_gpe-today ?= "0.10" 49PREFERRED_VERSION_gpe-today ?= "0.10"
50PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" 50#PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
51PREFERRED_VERSION_dbus ?= "0.23.4" 51PREFERRED_VERSION_dbus ?= "0.23.4"
52PREFERRED_VERSION_gpe-beam ?= "0.2.8" 52PREFERRED_VERSION_gpe-beam ?= "0.2.8"
53PREFERRED_VERSION_gpe-bluetooth ?= "0.45" 53PREFERRED_VERSION_gpe-bluetooth ?= "0.45"
@@ -80,7 +80,7 @@ PREFERRED_VERSION_gpe-plucker ?= "0.2"
80PREFERRED_VERSION_gpe-tetris ?= "0.6-4" 80PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
81PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" 81PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
82PREFERRED_VERSION_xdemineur ?= "2.1.1" 82PREFERRED_VERSION_xdemineur ?= "2.1.1"
83PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" 83#PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
84PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" 84PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
85PREFERRED_VERSION_dillo2 ?= "0.6.6" 85PREFERRED_VERSION_dillo2 ?= "0.6.6"
86PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" 86PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"