From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 20 Mar 2008 06:23:52 +0000 (+0000)
Subject: merge of '0b604857bbf871639fdb43ee8380222e8ef64bb7'
X-Git-Tag: Release-2010-05/1~7106^2^2~3^2^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59bf0fe4238ee5c18cf7dd7a8598b64445b8457f;p=openembedded.git

Merge ... '0b604857bbf871639fdb43ee8380222e8ef64bb7'
     and 'f2611b9289af3945942b74edcc7ef91fb0a597bd'
---

59bf0fe4238ee5c18cf7dd7a8598b64445b8457f
diff --cc packages/tzdata/tzdata_2007k.bb
index c4a2adee19,fde929de07..7a4e431255
--- a/packages/tzdata/tzdata_2007k.bb
+++ b/packages/tzdata/tzdata_2007k.bb
@@@ -38,11 -44,9 +38,10 @@@ do_install () 
  # Packages primarily organized by directory with a major city
  # in most time zones in the base package
  
 -PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \
 +PACKAGES = "${PN}-dbg tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \
      tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
      tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
- 
 +ALLOW_EMPTY_${PN}-dbg = "1"
  
  FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*"
  RPROVIDES_tzdata-africa = "tzdata-africa"
@@@ -157,3 -161,3 +156,6 @@@ FILES_${PN} += "${datadir}/zoneinfo/Pac
                  ${datadir}/zoneinfo/WET                  \
                  ${datadir}/zoneinfo/Zulu                 \
                  ${datadir}/zoneinfo/Etc/*"
++                ${datadir}/zoneinfo/WET                  \
++                ${datadir}/zoneinfo/Zulu                 \
++                ${datadir}/zoneinfo/Etc/*"