openmoko-session2: add proper RCONFLICTS

diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index db37535..0069481 100644 (file)
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -2,9 +2,8 @@ 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}

diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index cb191b3..de0db79 100755 (executable)
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -7,5 +7,5 @@ openmoko-dialer2 &
 
 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