aboutsummaryrefslogtreecommitdiffstats
path: root/packages/openmoko2/openmoko-session2.bb
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-11-14 08:30:32 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-11-14 08:30:32 +0000
commitf41bdbca1339f86a731ee4dab8773590260a186d (patch)
treeceb0b2690fc499a75be33c2b337bf373f0197ff9 /packages/openmoko2/openmoko-session2.bb
parent9cb19bbde5a18edf108eaa4b76dd615130b0e606 (diff)
downloadopenembedded-f41bdbca1339f86a731ee4dab8773590260a186d.tar.gz
openmoko-session2: RREPLACE/RPROVIDE instead of RCONFLICT
Diffstat (limited to 'packages/openmoko2/openmoko-session2.bb')
-rw-r--r--packages/openmoko2/openmoko-session2.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 6a33e62c42..922dc991db 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_${PN} = "openmoko-session matchbox-common"
-PR = "r41"
+RREPLACES = "openmoko-session matchbox-common"
+RPROVIDES = "matchbox-common"
+PR = "r42"
SRC_URI = "\
file://etc \