merge of '0b604857bbf871639fdb43ee8380222e8ef64bb7'

     and 'f2611b9289af3945942b74edcc7ef91fb0a597bd'

diff --combined packages/tzdata/tzdata_2007k.bb
index c4a2ade,fde929d..7a4e431
--- 1/packages/tzdata/tzdata_2007k.bb
--- 2/packages/tzdata/tzdata_2007k.bb
+++ b/packages/tzdata/tzdata_2007k.bb
@@@ -5,11 -5,17 +5,11 @@@ DEPENDS = "tzcode-native
  
  PR = "r2"
  
 -PROVIDES = "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"
 -RPROVIDES = "tzdata"
  RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
               timezone-arctic timezone-asia timezone-atlantic \
               timezone-australia timezone-europe timezone-indian \
               timezone-iso3166.tab timezone-pacific timezone-zone.tab"
  
 -RREPLACES_tzdata = "tzdata-dbg"
 -
  SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
  
  S = "${WORKDIR}"
@@@ -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/*"