[oe-commits] org.oe.dev mb-panel2: rconflict with mb-panel-1

[koen commit]

mb-panel2: rconflict with mb-panel-1

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 1ed4ea88aa1659704dd7e9205023eaef7387f051
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1ed4ea88aa1659704dd7e9205023eaef7387f051
Files:
1
packages/matchbox2/matchbox-panel-2_svn.bb
Diffs:

#
# mt diff -r39b23b4beb7895e8780a01657dbf05431b5a4918 -r1ed4ea88aa1659704dd7e9205023eaef7387f051
#
# 
# 
# patch "packages/matchbox2/matchbox-panel-2_svn.bb"
#  from [4cf66401bbd65b1cced04e327b223a2081e23cd9]
#    to [13d29cfac48c70941b2756e36611a2cc476e5649]
# 
============================================================
--- packages/matchbox2/matchbox-panel-2_svn.bb	4cf66401bbd65b1cced04e327b223a2081e23cd9
+++ packages/matchbox2/matchbox-panel-2_svn.bb	13d29cfac48c70941b2756e36611a2cc476e5649
@@ -1,12 +1,13 @@ RREPLACES = "matchbox-panel"
 DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray) application based on Gtk+"
 LICENSE = "GPL"
 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}"