[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 9654efd0eebfa92fdcbc39b156cbb2d42ee013fb

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 9654efd0eebfa92fdcbc39b156cbb2d42ee013fb
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Aug 22 01:07:07 2009 +0200

    s/trayer/stalonetray/
    
    Following the suggestion of Olivier and Sascha. Enrico
    suggested that matchbox would be just fine without either.

diff --git a/install.sh b/install.sh
index 8d70a41..7fa7c87 100755
--- a/install.sh
+++ b/install.sh
@@ -98,7 +98,7 @@ CDEBOOTSTRAP_EXCLUDE_PACKAGES=hello
 # because of some apt-get bug, console-setup must be listed
 # before any other X.Org package, for more information see
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=435662#45
-FSO_PACKAGES="matchbox-window-manager fso-frameworkd fso-gpsd openmoko-panel-plugin dbus-x11 trayer fso-utils mtd-utils \
+FSO_PACKAGES="matchbox-window-manager fso-frameworkd fso-gpsd openmoko-panel-plugin dbus-x11 stalonetray fso-utils mtd-utils \
 console-setup xserver-xorg-video-fbdev xserver-xorg-input-tslib xserver-xorg-core xserver-xorg xterm xinit xfonts-base x11-xserver-utils"
 
 # well-suited software for the FreeRunner
@@ -1125,7 +1125,7 @@ __END__
 	echo " * Installing /root/.xsession"
 	cat > "$INST_DIR/root/.xsession" <<EOMATCHBOX
 #!/bin/sh
-trayer --edge top &
+stalonetray &
 openmoko-panel-plugin &
 zhone &
 exec matchbox-window-manager -use_titlebar no -use_cursor no

-- 
Various non-packaged files