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

merge of 1e28595fffe28b835e1b38f536e5b2cc693f5564
     and d801ae9bc332586d6508633ec862c1cbc13409ec
---

99eeb3804015569a16a18f22120a43e7d674489c
diff --cc packages/meta/meta-maemo.bb
index 9b6ee6e073,4144a6c284..6f8e886a22
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@@ -1,6 -1,6 +1,6 @@@
  
- PR          = "r7"
 -PR          = "r4"
 -PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install
++PR          = "r6"
 +PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme
  DESCRIPTION = "Meta-package for maemo environment"
  MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
  
@@@ -43,7 -50,7 +43,8 @@@ maemo-task-base = "
      osso-core-config \
      osso-gnome-vfs2 \
      osso-thumbnail \
--    xauth"
++    xauth \
++    esd"
  
  RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \
  			   gdk-pixbuf-loader-xpm \