From: Koen Kooi <koen@openembedded.org>
Date: Sun, 25 Mar 2007 18:55:53 +0000 (+0000)
Subject: matchbox-panel2: don't make the applets replace mb-panel, that breaks image generatio... 
X-Git-Tag: Release-2010-05/1~8868^2~989
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eaa8e1dd0f11b98dd38c50e3d7a9c20452db123;p=openembedded.git

matchbox-panel2: don't make the applets replace mb-panel, that breaks image generation if you build both
---

diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb
index a0f4a7f484..5022afa41a 100644
--- a/packages/matchbox2/matchbox-panel-2_svn.bb
+++ b/packages/matchbox2/matchbox-panel-2_svn.bb
@@ -3,11 +3,11 @@ LICENSE = "GPL"
 SECTION = "x11/panels"
 DEPENDS = "gtk+"
 
-RREPLACES = "matchbox-panel"
-RCONFLICTS = "matchbox-panel"
+RREPLACES_${PN} = "matchbox-panel"
+RCONFLICTS_${PN} = "matchbox-panel"
 
 PV = "0.1+svn${SRCDATE}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"