[oe-commits] org.oe.dev tzdata: also rconflict with timezones

[koen commit]

tzdata: also rconflict with timezones

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 159e0203ae3c554f80e3e2a3e60c667d512714af
ViewMTN: http://monotone.openembedded.org/revision.psp?id=159e0203ae3c554f80e3e2a3e60c667d512714af
Files:
1
packages/tzdata/tzdata_2007c.bb
Diffs:

#
# mt diff -r7b0d8ae86dfa78df6d7b1d19f63e5031cc5f37f7 -r159e0203ae3c554f80e3e2a3e60c667d512714af
#
# 
# 
# patch "packages/tzdata/tzdata_2007c.bb"
#  from [b7d9235e043f38ac8d8eb1f29df59ffcc32275a7]
#    to [eb55726baae9b6c6b9ef0ab50b328ca9a7bba9ca]
# 
============================================================
--- packages/tzdata/tzdata_2007c.bb	b7d9235e043f38ac8d8eb1f29df59ffcc32275a7
+++ packages/tzdata/tzdata_2007c.bb	eb55726baae9b6c6b9ef0ab50b328ca9a7bba9ca
@@ -1,13 +1,15 @@ DEPENDS = "tzcode-native"
 DESCRIPTION = "Timezone data"
 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"