From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 3 Jul 2005 18:10:05 +0000 (+0000)
Subject: merge of a9cdfa26e73a0f7a055960fc96915e9e462c40f1
X-Git-Tag: Release-2010-05/1~9453^2~4243^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=575f004e329e2d8481a61bd0db2a64f968d12ab1;p=openembedded.git

merge of a9cdfa26e73a0f7a055960fc96915e9e462c40f1
     and fa9802a4f987a77a22af80edcff827efa1174b62
---

575f004e329e2d8481a61bd0db2a64f968d12ab1
diff --cc packages/meta/meta-maemo.bb
index 2482be0351,6f8e886a22..4144a6c284
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@@ -1,6 -1,6 +1,6 @@@
  
- PR          = "r5"
 -PR          = "r6"
--PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme
++PR          = "r4"
++PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install
  DESCRIPTION = "Meta-package for maemo environment"
  MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
  
@@@ -28,14 -28,14 +28,21 @@@ RDEPENDS_maemo-task-libs-install := "${
  maemo-task-base = "\
      bluez-utils-dbus \
      matchbox \
++    xcursor-transparent-theme \
++    sdk-default-theme \
++    sdk-default-theme-config \
++    sdk-default-icons \
++    sapwood \
      shared-mime-info \
      rxvt-unicode \
      xst \
      xhost \
      xrdb \
++    ttf-bitstream-vera \
      libgtkstylus \
      detect-stylus \
      outo \
++    sapwood \
      hildon-initscripts \
      libosso \
      osso-af-utils \
@@@ -43,8 -43,8 +50,7 @@@
      osso-core-config \
      osso-gnome-vfs2 \
      osso-thumbnail \
--    xauth \
--    esd"
++    xauth"
  
  RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \
  			   gdk-pixbuf-loader-xpm \
@@@ -52,26 -52,26 +58,8 @@@
  			   pango-module-basic-x \
  			   pango-module-basic-fc \
  			   ${maemo-task-base}"
--
  DEPENDS += " ${maemo-task-base}"
  
--
--maemo-task-theme = "\
--    xcursor-transparent-theme \
--    sdk-default-theme \
--    sdk-default-theme-config \
--    sdk-default-icons \
--    sapwood \
--    ttf-bitstream-vera \
--    sapwood \
--    osso-sounds"
--
--RDEPENDS_maemo-task-theme := "${maemo-task-theme}"
--
--DEPENDS += " ${maemo-task-theme}"
--
--
--
  maemo-task-apps = "\
      osso-gwobex \
      osso-gwconnect \
@@@ -81,10 -81,10 +69,8 @@@
      hildon-navigator \
      hildon-control-panel \
      osso-application-installer \ 
--    osso-app-killer \
--    osso-screenshot-tool \
      gpe-todo-hildon \
 -    gpe-contacts-hildon"
 +    gpe-contacts-maemo"
  
  RDEPENDS_maemo-task-apps := "${maemo-task-apps}"
  DEPENDS += " ${maemo-task-apps}"