From: Koen Kooi <koen@openembedded.org>
Date: Tue, 20 Mar 2007 17:51:09 +0000 (+0000)
Subject: tzdata: also rconflict with timezones
X-Git-Tag: Release-2010-05/1~8868^2~1046
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4dd6ef9c80c6a74d542a24697467a4a766b98fb;p=openembedded.git

tzdata: also rconflict with timezones
---

diff --git a/packages/tzdata/tzdata_2007c.bb b/packages/tzdata/tzdata_2007c.bb
index 3b6c45502b..1e8ff25137 100644
--- a/packages/tzdata/tzdata_2007c.bb
+++ b/packages/tzdata/tzdata_2007c.bb
@@ -3,11 +3,13 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "tzcode-native"
 
+PR = "r1"
+
 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= "timezone-africa timezone-america timezone-antarctica \
+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"