merge of '338ea31d4809a6db514f8ee9dbd35db2c426e83f'

     and '33ef958347850ae3830b2326a4476282484717bd'

3 files changed, 32 insertions, 42 deletions

diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index cad921020e..ece303d62a 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
 
-PR = "r30"
+PR = "r32"
 
 PACKAGES = "\
   task-openmoko-linux \
@@ -29,21 +29,9 @@ RDEPENDS_task-openmoko-everything := "${PACKAGES}"
 DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services"
 RDEPENDS_task-openmoko-linux = "\
   task-base \
-  base-files \
-  base-passwd \
-  busybox \
-  dropbear \
-  fuser \
-  initscripts \
-  netbase \
   sysfsutils \
-  setserial \
-  sysvinit \
-  sysvinit-pidof \
-  tinylogin \
   modutils-initscripts \
   module-init-tools-depmod \
-  udev \
   rsync \
 #  update-alternatives \
 "
@@ -153,6 +141,7 @@ DESCRIPTION_task-openmoko-demo = "OpenMoko: Demo Applications"
 RDEPENDS_task-openmoko-demo = "\
   matchbox-desktop \
   matchbox-keyboard \
+  openmoko-keyboard \
   matchbox-stroke \
   matchbox-config-gtk \
   matchbox-panel-2-applets \
@@ -167,6 +156,9 @@ RDEPENDS_task-openmoko-demo = "\
   openmoko-panel-demo-simple \
   openmoko-panel-gsm \
   openmoko-panel-mainmenu \
+  openmoko-rssreader \
+  openmoko-messages \
+  openmoko-today \
   xcursor-transparent-theme \
   web \
   rxvt-unicode \
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
index a9814d51a1..cbd1ab72f1 100644
--- a/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -21,73 +21,67 @@ RDEPENDS_task-sdk-base := "\
     glibc-dev \
     libgcc1 \
     alsa-dev \
-    audiofile-dev \
-    bluez-libs-dev \
+    libaudiofile-dev \
+    libbluetooth-dev \
     dbus-dev \
     expat-dev \
     fontconfig-dev \
     freetype-dev \
-    glib-2.0-dev \
+    libglib-2.0-dev \
     gstreamer-dev \
     libice-dev \
     ipkg-dev \
-    jpeg-dev \
+    libjpeg-dev \
     libapm-dev \
-    libasound \
+    libasound2 \
     libdisplaymigration-dev \
     libetpan-dev \
     libgcrypt-dev \
-    libglade-dev \
-    gnutls-dev \
+    libglade-2.0-dev \
+    libgnutls-dev \
     libgpg-error-dev \
-    libidl-dev \
+    libidl-2-dev \
     libiw-dev \
-    libmimedir-dev \
+    libmimedir-0.4-dev \
     libpcap-dev \
     libpixman-dev \
     libpng-dev \
     libschedule-dev \
     libsm-dev \
     libsoundgen-dev \
-    libsoup-dev \
+    libsoup-2.2-dev \
     libsvg-dev \
     libtododb-dev \
     libts-dev \
     libxml2-dev \
     ncurses-dev \
-    openobex-dev \
-    popt-dev \
-    readline-dev \
-    sqlite-dev \
+    libopenobex-dev \
+    libpopt-dev \
+    libreadline-dev \
+    libsqlite-dev \
     zlib-dev \
     libxmu-dev"
 
 RDEPENDS_task-sdk-x11 := "\
-    atk-dev \
-    cairo-dev \
+    libatk-1.0-dev \
+    libcairo-dev \
     gconf-dbus-dev \
     gtk+-dev \
     gtk-engines-dev \
     libsvg-cairo-dev \
-    libmatchbox-dev \
+    libmb-dev \
     matchbox-desktop-dev \
     pango-dev \
-    startup-notification-dev"
+    libstartup-notification-1-dev"
 
 RDEPENDS_task-sdk-x11-ext := "\
-    compositeext-dev \
-    damageext-dev \
-    fixesext-dev \
     libxcursor-dev \
     libxdmcp-dev \
-    libxfixes-dev \
     libxft-dev \
     libxrandr-dev \
     libxrender-dev \
     libxsettings-client-dev \
     randrext-dev \
-    recordext-dev \
-    renderext-dev \
     resourceext-dev \
     libx11-dev \
     libxau-dev \
@@ -103,14 +97,15 @@ RDEPENDS_task-sdk-x11-ext := "\
     libxt-dev \
     xtrans-dev \
     libxtst-dev"
-#    libxss-dev \
+
 
 RDEPENDS_task-sdk-gpe := "\
     libcontactsdb-dev \
-    esound-dev \
+    libesd-dev \
     libeventdb-dev \
     libgpepimc-dev \
     libgpevtype-dev \
     libgpelaunch-dev \
     libgpewidget-dev \
     libhandoff-dev"
+
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 92820e069c..99b9ea44ae 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 
@@ -68,9 +68,12 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
+
 # Add daemon required for HW RNG support
+SLUGOS_RNG_TOOLS_PACKAGE = "rng-tools"
+SLUGOS_RNG_TOOLS_PACKAGE_linux-uclibc = ""
 SLUGOS_STANDARD_RRECOMMENDS += "\
-rng-tools \
+${SLUGOS_RNG_TOOLS_PACKAGE} \
 "
 
 # Add modules required for usb support