summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-11-14 08:49:29 +0000
committerKoen Kooi <koen@openembedded.org>2007-11-14 08:49:29 +0000
commit8214222d232adab6e5ed177829f267456a80d6e2 (patch)
tree7d170166d8a622d44a90d34cb0bf6d6f89abfcc7
parentf41bdbca1339f86a731ee4dab8773590260a186d (diff)
disapproval of revision '9430cfa5a334ac688d23932a066f6495abfa4709'
-rw-r--r--packages/openmoko2/openmoko-session2.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 922dc991db..6a33e62c42 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -3,9 +3,8 @@ LICENSE = "GPL"
SECTION = "x11"
RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
-RREPLACES = "openmoko-session matchbox-common"
-RPROVIDES = "matchbox-common"
-PR = "r42"
+RCONFLICTS_${PN} = "openmoko-session matchbox-common"
+PR = "r41"
SRC_URI = "\
file://etc \