From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 16 Sep 2007 12:08:18 +0000 (+0000)
Subject: merge of '023be36fca00265ea31a1a05b16e2ff2a3480415'
X-Git-Tag: Release-2010-05/1~8625^2~79
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e5337dbdd3a5a11512ffcd8d22d2e2436c01f1c;p=openembedded.git

Merge ... '023be36fca00265ea31a1a05b16e2ff2a3480415'
     and '2240acf86047820a29307f8c7417de1943260355'
---

7e5337dbdd3a5a11512ffcd8d22d2e2436c01f1c
diff --cc packages/tasks/task-openmoko.bb
index dd3b13e206,cc9b67f8d7..3b48b674c7
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@@ -65,12 -62,16 +62,16 @@@ RDEPENDS_task-openmoko-ui = "
    xhost \
    xset \
    xrandr \
+   \
    settings-daemon \
+   notification-daemon \
+   neod \
+   libnotify \
    \
    openmoko-session2 \
 -  openmoko-sound-system \
 -  openmoko-sound-theme-standard \
 +  openmoko-sound-system2 \
 +  openmoko-sound-theme-standard2 \
-   neod \
+   \
    gpe-scap \
  "
  
@@@ -109,7 -106,10 +107,10 @@@ RDEPENDS_task-openmoko-base = "
    openmoko-panel-bt \
    openmoko-panel-clock \
    openmoko-panel-usb \
 -  openmoko-panel-gps \
 +  ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
+   \
+   openmoko-today2 \
+ #  openmoko-appmanager \
  "
  
  #