From: Koen Kooi <koen@openembedded.org>
Date: Wed, 7 Mar 2007 12:54:53 +0000 (+0000)
Subject: mb-panel2: rconflict with mb-panel-1
X-Git-Tag: Release-2010-05/1~8868^2~1105^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ed0b01b5752ce332d00f1b43ec366b32c49bd55;p=openembedded.git

mb-panel2: rconflict with mb-panel-1
---

diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb
index 1a92be3e37..a0f4a7f484 100644
--- a/packages/matchbox2/matchbox-panel-2_svn.bb
+++ b/packages/matchbox2/matchbox-panel-2_svn.bb
@@ -4,9 +4,10 @@ SECTION = "x11/panels"
 DEPENDS = "gtk+"
 
 RREPLACES = "matchbox-panel"
+RCONFLICTS = "matchbox-panel"
 
 PV = "0.1+svn${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"