Show
Ignore:
Timestamp:
03/30/08 14:13:11 (9 months ago)
Author:
bryank
Message:

Merge changes made in these recipes in OE, but don't undo changes we made locally.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • openembedded/zipitZ2BBfiles/tzdata/tzdata_2007k.bb

    r37 r63  
    44DEPENDS = "tzcode-native" 
    55 
    6 PR = "r0
     6PR = "r2
    77 
    8 PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ 
    9             tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ 
    10             tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" 
    11 RPROVIDES = "tzdata" 
    128RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ 
    139             timezone-arctic timezone-asia timezone-atlantic \ 
     
    4339# in most time zones in the base package 
    4440 
    45 PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ 
     41PACKAGES = "${PN}-dbg tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ 
    4642    tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ 
    4743    tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" 
     44 
     45ALLOW_EMPTY_${PN}-dbg = "1" 
    4846 
    4947FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" 
     
    127125                ${datadir}/zoneinfo/Asia/Hong_Kong       \ 
    128126                ${datadir}/zoneinfo/Asia/Tokyo           \ 
     127                ${datadir}/zoneinfo/Australia/Darwin     \ 
     128                ${datadir}/zoneinfo/Australia/Adelaide   \ 
     129                ${datadir}/zoneinfo/Australia/Brisbane   \ 
    129130                ${datadir}/zoneinfo/Australia/Sydney     \ 
    130131                ${datadir}/zoneinfo/Pacific/Noumea       \