From f41bdbca1339f86a731ee4dab8773590260a186d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 14 Nov 2007 08:30:32 +0000 Subject: openmoko-session2: RREPLACE/RPROVIDE instead of RCONFLICT --- packages/openmoko2/openmoko-session2.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/openmoko2/openmoko-session2.bb') diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 6a33e62c42..922dc991db 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -3,8 +3,9 @@ LICENSE = "GPL" SECTION = "x11" RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" -RCONFLICTS_${PN} = "openmoko-session matchbox-common" -PR = "r41" +RREPLACES = "openmoko-session matchbox-common" +RPROVIDES = "matchbox-common" +PR = "r42" SRC_URI = "\ file://etc \ -- cgit 1.2.3-korg