From: Koen Kooi <koen@openembedded.org>
Date: Wed, 14 Nov 2007 08:49:29 +0000 (+0000)
Subject: disapproval of revision '9430cfa5a334ac688d23932a066f6495abfa4709'
X-Git-Tag: Release-2010-05/1~8405^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8214222d232adab6e5ed177829f267456a80d6e2;p=openembedded.git

disapproval of revision '9430cfa5a334ac688d23932a066f6495abfa4709'
---

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 \