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

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

2004/09/19 02:45:25+01:00 (none)!cwiiis
Polish gpe for OpenZaurus-3.5.1.

2004/09/19 02:29:54+01:00 (none)!cwiiis
* Fix detect-sylus for the Zaurus
* Add missing/extra RDEPENDS for gpe-go and gpe-image
* Move/rename gpe-terminal files to conform with everything else

2004/09/18 23:52:14+01:00 (none)!cwiiis
Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages

2004/09/18 22:18:37+01:00 (none)!cwiiis
Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages

2004/09/18 21:38:04+01:00 (none)!cwiiis
Add gpe-games (gpe-lights, gpe-othello, gpe-tetris - I added gpe-go earlier).

2004/09/18 21:37:01+01:00 (none)!cwiiis
Stop packages that use libsdl-qpe from depending on virtual/libsdl.

BKrev: 414ce4c0YgyPZ2U5dMn-RkCNoRk30w

1 files changed, 68 insertions, 1 deletions

diff --git a/conf/openzaurus-3.5.1.conf b/conf/openzaurus-3.5.1.conf
index 8397851fe7..c8e1986391 100644
--- a/conf/openzaurus-3.5.1.conf
+++ b/conf/openzaurus-3.5.1.conf
@@ -3,7 +3,8 @@ include conf/openzaurus.conf
 CVSDATE = 20040915
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
+PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
@@ -208,3 +209,69 @@ PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
 
+#
+# GPE
+#
+
+PREFERRED_VERSION_libmatchbox = "1.2"
+PREFERRED_VERSION_matchbox = "0.8.1"
+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_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_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_gpe-soundserver = "0.4-1"
+PREFERRED_VERSION_gpe-todo = "0.48"
+PREFERRED_VERSION_gpe-calendar = "0.56"
+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_gpe-su = "0.18"
+PREFERRED_VERSION_gpe-conf = "0.1.19"
+PREFERRED_VERSION_gpe-clock = "0.14"
+PREFERRED_VERSION_gpe-mininet = "0.4"
+PREFERRED_VERSION_gpe-mixer = "0.38"
+PREFERRED_VERSION_gpe-shield = "0.6"
+PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
+PREFERRED_VERSION_gpe-taskmanager = "0.17"
+PREFERRED_VERSION_keylaunch = "2.0.7"
+PREFERRED_VERSION_minilite = "0.44"
+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.0.12"
+PREFERRED_VERSION_gpe-terminal = "1.1"
+PREFERRED_VERSION_gpe-watch = "0.10"
+PREFERRED_VERSION_gpe-what = "0.31"
+PREFERRED_VERSION_gpe-filemanager = "0.17"
+PREFERRED_VERSION_gpe-go = "0.05"
+PREFERRED_VERSION_gpe-irc = "0.07"
+PREFERRED_VERSION_gpe-lights = "0.12"
+PREFERRED_VERSION_gpe-othello = "0.2-1"
+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_dillo2 = "0.6.6"
+PREFERRED_VERSION_minimo = "cvs"
+PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
+PREFERRED_VERSION_linphone = "0.12.2"
+PREFERRED_VERSION_firefox = "0.9.3"
+