git.openpandora.org
/
openembedded.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4953856
)
mb-panel2: rconflict with mb-panel-1
author
Koen Kooi
<koen@openembedded.org>
Wed, 7 Mar 2007 12:54:53 +0000
(12:54 +0000)
committer
Koen Kooi
<koen@openembedded.org>
Wed, 7 Mar 2007 12:54:53 +0000
(12:54 +0000)
packages/matchbox2/matchbox-panel-2_svn.bb
patch
|
blob
|
history
diff --git
a/packages/matchbox2/matchbox-panel-2_svn.bb
b/packages/matchbox2/matchbox-panel-2_svn.bb
index
1a92be3
..
a0f4a7f
100644
(file)
--- 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 = "r
2
"
+PR = "r
3
"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
S = "${WORKDIR}/${PN}"