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

3 files changed, 159 insertions, 74 deletions

diff --git a/meta/gpe-collections.oe b/meta/gpe-collections.oe
index e69de29bb2..4282a702bf 100644
--- a/meta/gpe-collections.oe
+++ b/meta/gpe-collections.oe
@@ -0,0 +1,90 @@
+#
+# A collection of dependencies for images including GPE or parts of it.
+#
+
+GPE_BASE_DEPENDS = "\
+    diet-x11 \
+    virtual/xserver \
+    matchbox \
+    xcursor-transparent-theme \
+    rxvt-unicode \
+    gtk2-theme-angelistic \
+    xst \
+    xprop \
+    xhost \
+    xrdb \
+    gpe-soundserver"
+
+GPE_BASE_RDEPENDS = "\
+    ttf-bitstream-vera \
+    glibc-gconv \
+    glibc-gconv-iso8859-1 \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc"
+
+    
+GPE_BASE = "\
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    gpe-bootsplash \
+    libgtkstylus \
+    detect-stylus"
+
+GPE_PIM = "\
+    gpe-todo \
+    gpe-calendar \
+    gpe-sketchbook \
+    gpe-contacts \
+    gpe-today"
+
+GPE_EXTRA_PIM = "\
+    gpe-timesheet"
+
+GPE_BASE_SETTINGS = "\
+    matchbox-panel-manager \
+    gpe-bluetooth \
+    gpe-su \
+    gpe-conf \
+    gpe-clock \
+    gpe-mininet \
+    gpe-mixer \
+    gpe-shield \
+    gpe-wlancfg \
+    gpe-taskmanager \
+    keylaunch \
+    minilite"
+
+GPE_EXTRA_SETTINGS = "\
+    xmonobut"
+    
+GPE_BASE_APPS = "\
+    gpe-edit \
+    gpe-gallery \
+    gpe-calculator \
+    gpe-package \
+    gpe-terminal \
+    gpe-watch \
+    gpe-what \
+    matchbox-panel-hacks \
+    rosetta"
+
+GPE_MACHINE_CLASS ?= "none"
+
+GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
+GPE_EXTRA_INSTALL += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
+
+GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone ${GPE_EXTRA_PIM}"
+GPE_EXTRA_INSTALL_bigscreen = "firefox linphone ${GPE_EXTRA_PIM}"
+
+GPE_EXTRA_DEPENDS_smallscreen = "minimo linphone-hh ${GPE_EXTRA_PIM}"
+GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh ${GPE_EXTRA_PIM}"
+
+GPE_EXTRA_DEPENDS_none = "dillo2"
+GPE_EXTRA_INSTALL_none = "dillo2"
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 7d9c2180a2..ac67a2cc89 100644
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -1,6 +1,6 @@
 include gpe-collections.oe
 
-PR = "r1"
+PR = "r2"
 
 export IMAGE_BASENAME = "gpe-image"
 
diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
index 25c2dee3d1..88bda7ca23 100644
--- a/meta/meta-gpe.oe
+++ b/meta/meta-gpe.oe
@@ -1,32 +1,33 @@
-PACKAGES = gpe gpe-task-base gpe-task-utils gpe-task-pim
+PACKAGES = gpe gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-gtkapps gpe-task-gnomeapps
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r13"
+PR = "r14"
 
 ALLOW_EMPTY = 1
 
-RDEPENDS_gpe = "gpe-task-base gpe-task-utils gpe-task-pim"
-
 gpe-base = "\
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
+    diet-x11 \
+    virtual/xserver \
     matchbox \
     xcursor-transparent-theme \
     rxvt-unicode \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    gpe-bootsplash \
     gtk2-theme-angelistic \
-    libgtkstylus \
     xst \
     xprop \
     xhost \
     xrdb \
-    gpe-soundserver"
+    gpe-soundserver \
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    gpe-bootsplash \
+    libgtkstylus \
+    detect-stylus"
 
-RDEPENDS_gpe-task-base := "${gpe-base} libfontconfig-utils"
+RDEPENDS_gpe-task-base := "${gpe-base}"
 DEPENDS += " ${gpe-base}"
 
 gpe-task-pim = "\
@@ -35,78 +36,72 @@ gpe-task-pim = "\
     gpe-calendar \
     gpe-sketchbook \
     gpe-contacts \
-    gpe-today \
-    dillo2"
+    gpe-today"
 RDEPENDS_gpe-task-pim := "${gpe-task-pim}"
 DEPENDS += " ${gpe-task-pim}"
 
-gpe-task-utils = "\
+gpe-task-settings = "\
+    matchbox-panel-manager \
     gpe-bluetooth \
-    gpe-mixer \
-    gpe-edit \
     gpe-su \
     gpe-conf \
+    gpe-clock \
+    gpe-mininet \
+    gpe-mixer \
+    gpe-shield \
     gpe-wlancfg \
+    gpe-taskmanager \
+    keylaunch \
+    minilite \
+    xmonobut"
+
+RDEPENDS_gpe-task-settings := "${gpe-task-settings}"
+DEPENDS += " ${gpe-task-settings}"
+
+gpe-task-apps = "\
+    gpe-edit \
     gpe-gallery \
     gpe-calculator \
-    minilite \
-    miniclipboard \
-    gpe-taskmanager \
+    gpe-filemanager \
+    gpe-irc \
+    gpe-nmf \
     gpe-package \
-    gpe-clock \
-    gpe-watch \
+    gpe-plucker \
     gpe-terminal \
+    gpe-watch \
     gpe-what \
-    gpe-shield \
-    keylaunch \
-    gpe-mininet \
-    xmonobut \
     matchbox-panel-hacks \
     rosetta \
-    detect-stylus"
+    dillo2"
+
+RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
+DEPENDS += " ${gpe-task-apps}"
+
+gpe-task-games = "\
+    gpe-go \
+    gpe-lights \
+    gpe-othello \
+    gpe-tetris"
+
+RDEPENDS_gpe-task-games := "${gpe-task-games}"
+DEPENDS += " ${gpe-task-games}"
+
+gpe-task-gtkapps = "\
+    firefox \
+    thunderbird \
+    minimo \
+    gaim"
+
+RDEPENDS_gpe-task-gtkapps := "${gpe-task-gtkapps}"
+DEPENDS += " ${gpe-task-gtkapps}"
 
-RDEPENDS_gpe-task-utils := "${gpe-task-utils}"
-DEPENDS += " ${gpe-task-utils}"
+gpe-task-gnomeapps = "\
+    gail \
+    gal \
+    galculator \
+    gnumeric \
+    gpdf \
+    totem"
 
-#    gpe-collateral-gtk2 \
-#    gdk-pixbuf2-loader-jpeg \
-#    \
-#    gpe-bootsplash2 \
-#    \
-#    keylaunch \
-#    esd \
-#    detect-stylus \
-#    gpe-soundserver \
-#    gpe-mimedir-tools \
-#    teleport \
-#    gpe-keylock \
-#    \
-#    xmonobut \
-#    minilite \
-#    minibat \
-#    minipredict \
-#    matchbox-panel-hacks \
-#    mbinputmgr \
-#    \
-#    xstroke \
-#    rosetta \
-#    xkbd \
-#    mbmerlin \
-#    \
-#    startup-monitor \
-#    \
-#    xtscal \
-#    gpe-su2 \
-#    gpe-conf \
-#    gpe-confd \
-#    xst \
-#    \
-#    gpe-what \
-#    gpe-question2 \
-#    gpe-announce2 \
-#    \
-#    gpe-wlancfg \
-#    gpe-aerial \
-#    hotplug-dbus \
-#    gpe-autostarter \
-#    nsqld
+RDEPENDS_gpe-task-gnomeapps := "${gpe-task-gnomeapps}"
+DEPENDS += " ${gpe-task-gnomeapps}"