diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-07-30 13:51:33 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-07-30 13:51:33 +0000 |
| commit | fa6267e027e51aca5bcc436bf849c7a13dadc76b (patch) | |
| tree | 87be8b6fdaed5aa61f115dee1595e47733cecc62 | |
| parent | 7234aab6c92ac79baafec4e4248c500f54dedee6 (diff) | |
openmoko-session2: add proper RCONFLICTS
| -rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 5 | ||||
| -rwxr-xr-x | packages/openmoko2/openmoko-session2/etc/matchbox/session | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index db375357b8..006948109f 100644 --- 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 cb191b3097..de0db79475 100755 --- 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 |