openmoko-session2: RREPLACE/RPROVIDE instead of RCONFLICT

diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 6a33e62..922dc99 100644 (file)
--- 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 \