[oe-commits] org.oe.dev openmoko-session2: RREPLACE/RPROVIDE instead of RCONFLICT

[mickeyl commit]

openmoko-session2: RREPLACE/RPROVIDE instead of RCONFLICT

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9430cfa5a334ac688d23932a066f6495abfa4709
ViewMTN: http://monotone.openembedded.org/revision/info/9430cfa5a334ac688d23932a066f6495abfa4709
Files:
1
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -r12505e50e7fe9d65a3058e99c2a7dc84391cd917 -r9430cfa5a334ac688d23932a066f6495abfa4709
#
# 
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [f6635b41edbfb8e7f33d5335810429dd06cb03a5]
#    to [6a49d5ee5cf7764ce7cabf3a367907f08278c1dc]
# 
============================================================
--- packages/openmoko2/openmoko-session2.bb	f6635b41edbfb8e7f33d5335810429dd06cb03a5
+++ packages/openmoko2/openmoko-session2.bb	6a49d5ee5cf7764ce7cabf3a367907f08278c1dc
@@ -1,10 +1,11 @@ RDEPENDS += "openmoko-common2 openmoko-t
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 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 \