Merge bk://openembedded@openembedded.bkbits.net/packages

into chris.(none):/home/cwiiis/oe/packages

2004/09/19 13:33:11+01:00 (none)!cwiiis
Fix some gpe-related stuff in openzaurus-3.5.1.conf.

2004/09/19 09:46:47+01:00 (none)!cwiiis
Change versions of gpe-bluetooth and dbus for OZ3.5.1 to the correct ones.

BKrev: 414d7cc3AUmCWhb5leMG-X6t8UbdEQ

diff --git a/conf/openzaurus-3.5.1.conf b/conf/openzaurus-3.5.1.conf
index c8e1986..eeaa8db 100644 (file)
--- a/conf/openzaurus-3.5.1.conf
+++ b/conf/openzaurus-3.5.1.conf
@@ -219,20 +219,23 @@ PREFERRED_VERSION_matchbox-common = "0.8"
 PREFERRED_VERSION_matchbox-desktop = "0.8.1"
 PREFERRED_VERSION_matchbox-wm = "0.8.2"
 PREFERRED_VERSION_matchbox-panel = "0.8.1"
+PREFERRED_VERSION_matchbox-applet-inputmanager = "0.5"
 PREFERRED_VERSION_gtk+ = "2.4.4"
 PREFERRED_VERSION_libgpewidget = "0.90"
-PREFERRED_VERSION_libgpelaunch = "0.10"
 PREFERRED_VERSION_libgpepimc = "0.3"
 PREFERRED_VERSION_libgpevtype = "0.4"
+PREFERRED_VERSION_libschedule = "0.13"
 PREFERRED_VERSION_gpe-icons = "0.22"
 PREFERRED_VERSION_diet-x11 = "6.2.1"
 PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
 PREFERRED_VERSION_rxvt-unicode = "3.7"
 PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
 PREFERRED_VERSION_xst = "0.14"
-PREFERRED_VERSION_xprop = "cvs" 
-PREFERRED_VERSION_xhost = "20040413"
-PREFERRED_VERSION_xrdb = "cvs"
+PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" 
+PREFERRED_VERSION_xhost = "0.0cvs20040413"
+PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_gpe-login = "0.73"
+PREFERRED_VERSION_gpe-session-scripts = "0.61"
 PREFERRED_VERSION_gpe-soundserver = "0.4-1"
 PREFERRED_VERSION_gpe-todo = "0.48"
 PREFERRED_VERSION_gpe-calendar = "0.56"
@@ -240,7 +243,8 @@ PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
 PREFERRED_VERSION_gpe-contacts = "0.28"
 PREFERRED_VERSION_gpe-today = "0.08"
 PREFERRED_VERSION_matchbox-panel-manager = "0.1"
-PREFERRED_VERSION_gpe-bluetooth = "0.37"
+PREFERRED_VERSION_dbus = "0.21"
+PREFERRED_VERSION_gpe-bluetooth = "0.36.3"
 PREFERRED_VERSION_gpe-su = "0.18"
 PREFERRED_VERSION_gpe-conf = "0.1.19"
 PREFERRED_VERSION_gpe-clock = "0.14"
@@ -268,9 +272,9 @@ PREFERRED_VERSION_gpe-plucker = "0.1"
 PREFERRED_VERSION_gpe-session-scripts = "0.61"
 PREFERRED_VERSION_gpe-tetris = "0.6-2"
 PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1"
-PREFERRED_VERSION_rosetta = "cvs"
+PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_dillo2 = "0.6.6"
-PREFERRED_VERSION_minimo = "cvs"
+PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
 PREFERRED_VERSION_linphone = "0.12.2"
 PREFERRED_VERSION_firefox = "0.9.3"