[oe-commits] Frans Meulenbroeks : tzdata.inc: RCONFLICTS -> RCONFLICTS_${PN}

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: d533262dfe6845cf82386493916dfc021c3545ac
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d533262dfe6845cf82386493916dfc021c3545ac

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Fri Oct  8 12:05:53 2010 +0200

tzdata.inc: RCONFLICTS -> RCONFLICTS_${PN}

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Acked-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/tzdata/tzdata.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/tzdata/tzdata.inc b/recipes/tzdata/tzdata.inc
index 1f4dfdb..9d71354 100644
--- a/recipes/tzdata/tzdata.inc
+++ b/recipes/tzdata/tzdata.inc
@@ -3,11 +3,11 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "tzcode-native"
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 DEFAULT_TIMEZONE ?= "Europe/London"
 
-RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
+RCONFLICTS_${PN} = "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"