[oe-commits] org.oe.dev openmoko-session2: add proper RCONFLICTS

[koen commit]

openmoko-session2: add proper RCONFLICTS

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 27c57b53df69b0a7ad0a9dd5da0376b841bb2a39
ViewMTN: http://monotone.openembedded.org/revision.psp?id=27c57b53df69b0a7ad0a9dd5da0376b841bb2a39
Files:
1
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -r123a709fa96cfe514966d3c919503eec2784a9e4 -r27c57b53df69b0a7ad0a9dd5da0376b841bb2a39
#
# 
# 
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
#  from [9c9c5b84b31cad14cd854c1b181b95112ccf9e59]
#    to [26f95f7ca147900b49432aadc380a147c5b707f2]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [dd2e822cb7ac9516ae79dfdf3c6221fb71113b34]
#    to [9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c]
# 
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session	9c9c5b84b31cad14cd854c1b181b95112ccf9e59
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session	26f95f7ca147900b49432aadc380a147c5b707f2
@@ -7,5 +7,5 @@ matchbox-window-manager -use_titlebar ye
 
 matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
 
-exec matchbox-panel --start-applets showdesktop --end-applets clock,battery,systray,startup --titlebar
+exec matchbox-panel-2 --start-applets showdesktop --end-applets clock,battery,systray,startup --titlebar
 
============================================================
--- packages/openmoko2/openmoko-session2.bb	dd2e822cb7ac9516ae79dfdf3c6221fb71113b34
+++ packages/openmoko2/openmoko-session2.bb	9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c
@@ -1,10 +1,9 @@ RDEPENDS = "matchbox-applet-startup-moni
 DESCRIPTION = "Custom MB session files for poky"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
-# RDEPENDS = "matchbox-applet-startup-monitor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato"
-# RCONFLICTS = "matchbox-common matchbox-sato"
-PR = "r19"
+RCONFLICTS = "matchbox-common openmoko-session"
+PR = "r20"
 
 SRC_URI = "file://etc file://matchbox-session"
 S = ${WORKDIR}