summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-03-07 12:54:53 +0000
committerKoen Kooi <koen@openembedded.org>2007-03-07 12:54:53 +0000
commit6ed0b01b5752ce332d00f1b43ec366b32c49bd55 (patch)
treed9b320194cc4ad490f176f39557af9340875142a
parent4953856a1bde6f8635cf92caff2889a439254b85 (diff)
mb-panel2: rconflict with mb-panel-1
-rw-r--r--packages/matchbox2/matchbox-panel-2_svn.bb3
1 files changed, 2 insertions, 1 deletions
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}"