pimlico: Remove

Remove the Pimlico applications (Contacts, Dates, Tasks).  oe-core isn't a
reference PIM stack, so we don't need this.

(From OE-Core rev: 373895e6c691277e15a09aee3504243448c55b50)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 6 insertions, 35 deletions

diff --git a/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb
deleted file mode 100644
index 835625c056..0000000000
--- a/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenedHand Ltd.
-#
-
-DESCRIPTION = "X11 Pimlico Appications List"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r28"
-
-PACKAGES = "\
-    task-core-apps-x11-pimlico \
-    task-core-apps-x11-pimlico-dbg \
-    task-core-apps-x11-pimlico-dev \
-    "
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = "1"
-
-WEB ?= ""
-#WEB = "web-webkit"
-# WebKit takes too much space to fit on some devices
-# List here for now...
-#WEB_c7x0 = ""
-#WEB_mx31ads = ""
-
-RDEPENDS_task-core-apps-x11-pimlico = "\
-    evolution-data-server \
-    contacts \
-    dates \
-    tasks \
-    gaku \
-    ${WEB}"
diff --git a/meta/recipes-sato/tasks/task-core-x11-sato.bb b/meta/recipes-sato/tasks/task-core-x11-sato.bb
index ed43075d6b..cf294b302c 100644
--- a/meta/recipes-sato/tasks/task-core-x11-sato.bb
+++ b/meta/recipes-sato/tasks/task-core-x11-sato.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Sato Tasks for Poky"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r31"
+PR = "r32"
 
 PACKAGES = "\
     task-core-x11-sato \
@@ -21,6 +21,9 @@ ALLOW_EMPTY = "1"
 NETWORK_MANAGER ?= "connman-gnome"
 NETWORK_MANAGER_libc-uclibc = ""
 
+WEB ?= ""
+#WEB = "web-webkit"
+
 RDEPENDS_task-core-x11-sato = "\
     matchbox-desktop \
     matchbox-session-sato \
@@ -34,4 +37,6 @@ RDEPENDS_task-core-x11-sato = "\
     gthumb \
     x11vnc \
     libsdl \
+    gaku \
+    ${WEB} \
     ${NETWORK_MANAGER}"