summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2007-11-13 15:02:00 +0000
committerGraeme Gregory <dp@xora.org.uk>2007-11-13 15:02:00 +0000
commit9f0bd5cd2d93a2ed76637ca5bbf207e763fc7edf (patch)
treeb3a46747e5791994a544d40775a8549c925a1c86
parente029c63dd68e32381d582aadcbce368b1873f850 (diff)
openmoko-session2.bb, openmoko-today2-folders_svn.bb : conflict/replace
matchbox-common
-rw-r--r--packages/openmoko2/openmoko-session2.bb5
-rw-r--r--packages/openmoko2/openmoko-today2-folders_svn.bb4
2 files changed, 6 insertions, 3 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index fd1b0d30ac..2b18870aec 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 = "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 ecd28d1b68..4f72ac9a94 100644
--- 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