From: Holger Freyther <zecke@selfish.org>
Date: Sat, 22 Mar 2008 00:32:21 +0000 (+0000)
Subject: merge of '4216327dbc55e359d557266da86971e66ff5f595'
X-Git-Tag: Release-2010-05/1~7106^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0362af65b95845f571763fa56e6031a8089091fc;p=openembedded.git

Merge ... '4216327dbc55e359d557266da86971e66ff5f595'
     and 'd72643015c099d3f2c3ec5c5bb1294365effbe54'
---

0362af65b95845f571763fa56e6031a8089091fc
diff --cc packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
index 45f3297212,9dfbd8a716..3ccfe2803e
--- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
+++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
@@@ -11,12 -11,12 +11,12 @@@ LICENSE = "GPL
  PRIORITY = "optional"
  HOMEPAGE = "http://www.trolltech.com"
  DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"
- RDEPENDS = "atd"
+ RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
  PROVIDES = "qtopia-phone"
- PR = "r7"
+ PR = "r8"
  SRCREV = "${AUTOREV}"
  SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
 -           file://Xsession.d/99qtopia \
 +           file://Xsession.d/89qtopia \
             file://qtopia.sh"
  
  S = "${WORKDIR}/git"