Signed-off-by: Martin Jansa <martin.ja...@gmail.com>
---
meta/recipes-extended/tzdata/tzdata_2012c.bb | 4 ++--
.../matchbox-session/matchbox-session_0.1.bb | 4 ++--
.../mini-x-session/mini-x-session_0.1.bb | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-extended/tzdata/tzdata_2012c.bb
b/meta/recipes-extended/tzdata/tzdata_2012c.bb
index fab8e01..bce787f 100644
--- a/meta/recipes-extended/tzdata/tzdata_2012c.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2012c.bb
@@ -5,9 +5,9 @@ LICENSE = "PD"
LIC_FILES_CHKSUM =
"file://asia;beginline=3;endline=4;md5=06468c0e84ef4d4c97045a4a29b08234"
DEPENDS = "tzcode-native"
-PR = "r0"
+PR = "r1"
-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"
diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
index dc10031..3faa16c 100644
--- a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
+++ b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
@@ -6,12 +6,12 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM =
"file://matchbox-session;endline=20;md5=180f1c169a15d059a56c30094f6fb5ea"
SECTION = "x11"
-RCONFLICTS = "matchbox-common"
+RCONFLICTS_${PN} = "matchbox-common"
SRC_URI = "file://matchbox-session"
S = "${WORKDIR}"
-PR = "r1"
+PR = "r2"
inherit update-alternatives
diff --git a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
index 8f28d03..bc9368a 100644
--- a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
+++ b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Mini X session files for poky"
HOMEPAGE = "http://www.yoctoproject.org";
BUGTRACKER = "http://bugzilla.pokylinux.org";
-PR = "r1"
+PR = "r2"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM =
"file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938826b7487"
SECTION = "x11"
-RCONFLICTS = "matchbox-common"
+RCONFLICTS_${PN} = "matchbox-common"
SRC_URI = "file://mini-x-session"
S = "${WORKDIR}"
--
1.7.8.6
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
