openmoko-session2: don't ship $bindir/matchbox-session, rather depend on matchbox...

diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 0069481..d24d57e 100644 (file)
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,16 +1,14 @@
 DESCRIPTION = "Custom MB session files for poky"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
-RCONFLICTS = "matchbox-common openmoko-session"
-PR = "r20"
+RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
+RCONFLICTS = "openmoko-session"
+PR = "r21"
 
 SRC_URI = "file://etc file://matchbox-session"
 S = ${WORKDIR}
 
 do_install() {
-       install -d ${D}/${bindir}
-       install -m 0755 ${S}/matchbox-session ${D}/${bindir}
        cp -R ${S}/etc ${D}/etc
        rm -fR ${D}/etc/.svn
        rm -fR ${D}/etc/matchbox/.svn

diff --git a/packages/openmoko2/openmoko-session2/matchbox-session b/packages/openmoko2/openmoko-session2/matchbox-session
deleted file mode 100644 (file)
index 658ce4b..0000000
--- a/packages/openmoko2/openmoko-session2/matchbox-session
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Very simple session manager for matchbox tools
-#
-
-# Uncomment below to enable parsing of debian menu entrys
-# export MB_USE_DEB_MENUS=1 
-
-if [ -e $HOME/.matchbox/session ]
-then
-exec $HOME/.matchbox/session
-fi
-
-if [ -e /etc/matchbox/session ]
-then
-exec /etc/matchbox/session
-fi
-
-# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
-# dont exist. 
-
-matchbox-desktop-2 &
-matchbox-panel-2  --orientation south &
-exec matchbox-window-manager $@