From: Holger Freyther <zecke@selfish.org>
Date: Tue, 18 Mar 2008 22:30:30 +0000 (+0000)
Subject: packages/tzdata: Only tzdata should provide tzdata, specially not tzdata-dbg
X-Git-Tag: Release-2010-05/1~7375
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42fcd2ba5af8d6ebf10fc8a3d57a6fac30dc6a57;p=openembedded.git

packages/tzdata: Only tzdata should provide tzdata, specially not tzdata-dbg
    tzdata-dbg was an empty package and provided tzdata. ipkg preferred the empty
    package over 'tzdata' (the package) for tzdata (the provider) resulting in
    /usr/share/zoneinfo/America/New_York missing.
    For upgrading reasons keep the empty tzdata-dbg  around but stop providing
    tzdata. (blind fix)
---

diff --git a/packages/tzdata/tzdata_2007k.bb b/packages/tzdata/tzdata_2007k.bb
index 2fbe9ac884..f6e45af399 100644
--- a/packages/tzdata/tzdata_2007k.bb
+++ b/packages/tzdata/tzdata_2007k.bb
@@ -3,12 +3,11 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "tzcode-native"
 
-PR = "r1"
+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 \
@@ -46,6 +45,8 @@ 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"