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

matchbox-common

diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index fd1b0d3..2b18870 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 = "openmoko-session"
-PR = "r39"
+RCONFLICTS_${PN} = "openmoko-session matchbox-common"
+RREPLACES_${PN} = "matchbox-common"
+PR = "r40"
 
 SRC_URI = "\
   file://etc \

diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb
index ecd28d1..4f72ac9 100644 (file)
--- a/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,7 +1,9 @@
 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