Merging with Openembedded

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

2 files changed, 24 insertions, 25 deletions

diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index 02761a7d0e..9cabcf3a47 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -138,9 +138,6 @@ PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
 PREFERRED_VERSION_keylaunch ?= "2.0.7"
 PREFERRED_VERSION_librsvg ?= "2.6.5"
-PREFERRED_VERSION_libgpewidget ?= "0.103"
-PREFERRED_VERSION_libgpepimc ?= "0.5"
-PREFERRED_VERSION_libgpevtype ?= "0.12"
 PREFERRED_VERSION_libgsm ?= "1.0.10"
 PREFERRED_VERSION_libschedule ?= "0.15"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
@@ -149,9 +146,10 @@ PREFERRED_VERSION_minilite ?= "0.49"
 PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
 PREFERRED_VERSION_poppler ?= "0.3.3"
 PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_rxvt-unicode ?= "5.3"
+PREFERRED_VERSION_rxvt-unicode ?= "5.6"
 PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
 PREFERRED_VERSION_xdemineur ?= "2.1.1"
+PREFERRED_VERSION_xextensions ?= "1.0.1"
 PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
 PREFERRED_VERSION_xmonobut ?= "0.4"
 PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
index f9c96b4849..e535f4e12a 100644
--- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
@@ -3,39 +3,40 @@
 #
 
 #work around some breakages
-CVSDATE_minimo=20050401
+#CVSDATE_minimo=20050401
 
 #set some preferred providers:
-#PREFERRED_PROVIDER_gconf=gconf-dbus
+PREFERRED_PROVIDER_gconf=gconf-dbus
 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"
 PREFERRED_VERSION_gtk+ ?= "2.6.7"
 PREFERRED_VERSION_pango ?= "1.8.1"
 PREFERRED_VERSION_librsvg ?= "2.6.5"
-PREFERRED_VERSION_libgpewidget ?= "0.103"
+PREFERRED_VERSION_libgpewidget ?= "0.105"
 PREFERRED_VERSION_libgpepimc ?= "0.5"
-PREFERRED_VERSION_libgpevtype ?= "0.12"
+PREFERRED_VERSION_libgpevtype ?= "0.14"
 PREFERRED_VERSION_libschedule ?= "0.15"
 PREFERRED_VERSION_gpe-icons ?= "0.25"
 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_rxvt-unicode ?= "5.6"
 PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 PREFERRED_VERSION_xst ?= "0.15"
-#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_xextensions ?= "1.0.1"
+PREFERRED_VERSION_xserver-kdrive = "0.0cvs20050207"
 PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
 PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
 PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
@@ -43,20 +44,20 @@ PREFERRED_VERSION_gpe-login ?= "0.83"
 PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
 PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
 PREFERRED_VERSION_gpe-todo ?= "0.54"
-PREFERRED_VERSION_gpe-calendar ?= "0.65"
+PREFERRED_VERSION_gpe-calendar ?= "0.66"
 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"
-PREFERRED_VERSION_gpe-su ?= "0.18"
-PREFERRED_VERSION_gpe-conf ?= "0.1.25"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.47"
+PREFERRED_VERSION_gpe-su ?= "0.19"
+PREFERRED_VERSION_gpe-conf ?= "0.1.26"
 PREFERRED_VERSION_gpe-clock ?= "0.21"
 PREFERRED_VERSION_gpe-mininet ?= "0.5"
 PREFERRED_VERSION_gpe-mixer ?= "0.42"
-PREFERRED_VERSION_gpe-shield ?= "0.7"
+PREFERRED_VERSION_gpe-shield ?= "0.8"
 PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
 PREFERRED_VERSION_gpe-taskmanager ?= "0.18"
 PREFERRED_VERSION_keylaunch ?= "2.0.7"
@@ -80,7 +81,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}"
@@ -90,4 +91,4 @@ PREFERRED_VERSION_firefox ?= "1.0"
 PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
 PREFERRED_VERSION_poppler ?= "0.3.3"
 PREFERRED_VERSION_evince ?= "0.3.2"
-PREFERRED_VERSION_gpe_mini_browser ?= "0.15"
+PREFERRED_VERSION_gpe_mini_browser ?= "0.17"