Update poky-additions and gpe-preferred-versions so everything should work after...

git-svn-id: https://svn.o-hand.com/repos/poky@167 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/openembedded/conf/distro/poky-additions.inc b/openembedded/conf/distro/poky-additions.inc
index 8a1345abf1a58dc00f91c221b189227f2d89b9c3..1474aebdbf21bafe8bee64e8aa8ee8e27fedc079 100644 (file)
--- a/openembedded/conf/distro/poky-additions.inc
+++ b/openembedded/conf/distro/poky-additions.inc
@@ -32,21 +32,25 @@ CVSDATE_damageext = "20051101"
 CVSDATE_compositeext = "20051101"
 CVSDATE_xcalibrateext = "20051101"
 CVSDATE_recordext = "20051101"
-
-
-#PREFERRED_VERSION_matchbox = "0.9.1"
-#PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
-#PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
-#PREFERRED_VERSION_matchbox-common = "0.9.1+cvs-${CVSDATE}"
-#PREFERRED_VERSION_matchbox-config-gtk = "0.0+cvs-${CVSDATE}"
-#PREFERRED_VERSION_matchbox-desktop = "0.9.1+cvs-${CVSDATE}"
-#PREFERRED_VERSION_matchbox-keyboard = "0.0+cvs-${CVSDATE}"
-#PREFERRED_VERSION_matchbox-panel = "0.9.2+cvs-${CVSDATE}"
-#PREFERRED_VERSION_matchbox-panel-manager = "0.0+cvs-${CVSDATE}"
-#PREFERRED_VERSION_matchbox-stroke = "0.0+cvs-${CVSDATE}"
-#PREFERRED_VERSION_matchbox-themes-extra = "0.3+cvs-${CVSDATE}"
-#PREFERRED_VERSION_matchbox-wm = "0.9.5+cvs-${CVSDATE}"
-#PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}"
+CVSDATE_libfakekey = "20051101"
+CVSDATE_xmodmap = "20051101"
+CVSDATE_xrandr = "20051101"
+CVSDATE_xtst = "20051101"
+CVSDATE_xcalibrate = "20051101"
+
+PREFERRED_VERSION_matchbox = "0.9.1"
+PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
+PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
+PREFERRED_VERSION_matchbox-common = "0.9.1+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-config-gtk = "0.0+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-desktop = "0.9.1+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-keyboard = "0.0+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-panel = "0.9.2+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-panel-manager = "0.0+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-stroke = "0.0+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-themes-extra = "0.3+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-wm = "0.9.5+cvs-${CVSDATE}"
+PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}"
 
 
 PREFERRED_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 561bc79c06077e9c9f0571101806dc7ecf3db3f7..f9c96b48492fba447defd7e1fc4f2473e3a0e280 100644 (file)
--- 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
 PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
 
 #specify versions, as the header says :)
-PREFERRED_VERSION_libmatchbox ?= "1.7"
-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.5+cvs-${CVSDATE}"
-PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
-PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+#PREFERRED_VERSION_libmatchbox ?= "1.7"
+#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.5+cvs-${CVSDATE}"
+#PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
+#PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
 PREFERRED_VERSION_atk ?= "1.9.0"
 PREFERRED_VERSION_cairo ?= "0.5.2"
 PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
@@ -47,7 +47,7 @@ PREFERRED_VERSION_gpe-calendar ?= "0.65"
 PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
 PREFERRED_VERSION_gpe-contacts ?= "0.42"
 PREFERRED_VERSION_gpe-today ?= "0.10"
-PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
+#PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
 PREFERRED_VERSION_dbus ?= "0.23.4"
 PREFERRED_VERSION_gpe-beam ?= "0.2.8" 
 PREFERRED_VERSION_gpe-bluetooth ?= "0.45"
@@ -80,7 +80,7 @@ PREFERRED_VERSION_gpe-plucker ?= "0.2"
 PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
 PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
 PREFERRED_VERSION_xdemineur ?= "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-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}"