[oe-commits] org.oe.dev openmoko-session2.bb, openmoko-today2-folders_svn.bb : conflict/replace

[xora commit]

openmoko-session2.bb, openmoko-today2-folders_svn.bb : conflict/replace
matchbox-common

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 2c836c72090e9a06860096627e902f49c103f562
ViewMTN: http://monotone.openembedded.org/revision/info/2c836c72090e9a06860096627e902f49c103f562
Files:
1
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-today2-folders_svn.bb
Diffs:

#
# mt diff -rcb1a6fcbd6c4cd5c14c1b57d2478b6276e246745 -r2c836c72090e9a06860096627e902f49c103f562
#
# 
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [cc3fb3acd8a64a6ec187b76f9aa4736fe8d52555]
#    to [f186993a5ae9b6417b6d498b2e29dc8164dad287]
# 
# patch "packages/openmoko2/openmoko-today2-folders_svn.bb"
#  from [21d248e9792e2604795f7bbd7c3ad69ced87301f]
#    to [90e242a90fac296a369c67150653c19f6e9356d5]
# 
============================================================
--- packages/openmoko2/openmoko-session2.bb	cc3fb3acd8a64a6ec187b76f9aa4736fe8d52555
+++ packages/openmoko2/openmoko-session2.bb	f186993a5ae9b6417b6d498b2e29dc8164dad287
@@ -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 = "openmoko-session"
-PR = "r39"
+RCONFLICTS_${PN} = "openmoko-session matchbox-common"
+RREPLACES_${PN} = "matchbox-common"
+PR = "r40"
 
 SRC_URI = "\
   file://etc \
============================================================
--- packages/openmoko2/openmoko-today2-folders_svn.bb	21d248e9792e2604795f7bbd7c3ad69ced87301f
+++ packages/openmoko2/openmoko-today2-folders_svn.bb	90e242a90fac296a369c67150653c19f6e9356d5
@@ -1,7 +1,9 @@ PV = "0.1.0+svnr${SRCREV}"
 DESCRIPTION = "The OpenMoko Today2 vfolder files"
 SECTION = "openmoko/misc"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
+RCONFLICTS_${PN} = "matchbox-common"
+RREPLACES_${PN} = "matchbox-common"
 
 inherit openmoko2