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

[Joachim Breitner]

The following commit has been merged in the master branch:
commit 6c48bb533ab8092b2129f7b2d52f8fa04763df55
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Oct 7 22:30:23 2008 +0200

    Use nodm instead of zhone-session
    
    And use trayer and openmoko-panel-plugin for keyboard switching.
    matchbox-keyboard-toggle goes away.

diff --git a/install.sh b/install.sh
index 00c8e2b..c478e8b 100755
--- a/install.sh
+++ b/install.sh
@@ -54,7 +54,8 @@ CDEBOOTSTRAP_EXCLUDE_PACKAGES=hello
 
 # fso-specific packages
 # With work around for some APT/aptitude bug (http://bugs.debian.org/435662)
-FSO_PACKAGES="zhone-session xserver-xorg-video-fbdev xserver-xorg-input-tslib xterm xinit xfonts-base x11-xserver-utils fso-utils mtd-utils pkg-fso-keyring \
+FSO_PACKAGES="nodm zhone fso-frameworkd openmoko-panel-plugin dbus-x11 trayer fso-utils mtd-utils \
+xserver-xorg-video-fbdev xserver-xorg-input-tslib xterm xinit xfonts-base x11-xserver-utils \
 xserver-xorg-input-all- xserver-xorg-input-synaptics- xserver-xorg-input-wacom- xserver-xorg-video-all- xserver-xorg-video-v4l- xserver-xorg-video-voodoo- xserver-xorg-video-vga- xserver-xorg-video-vesa- xserver-xorg-video-tseng- xserver-xorg-video-trident- xserver-xorg-video-tga- xserver-xorg-video-tdfx- xserver-xorg-video-sisusb- xserver-xorg-video-sis- xserver-xorg-video-siliconmotion- xserver-xorg-video-savage- xserver-xorg-video-s3virge- xserver-xorg-video-s3- xserver-xorg-video-rendition- xserver-xorg-video-radeonhd- xserver-xorg-video-nv- xserver-xorg-video-nsc- xserver-xorg-video-neomagic- xserver-xorg-video-mga- xserver-xorg-video-imstt- xserver-xorg-video-i740- xserver-xorg-video-i128- xserver-xorg-video-glint- xserver-xorg-video-dummy- xserver-xorg-video-cyrix- xserver-xorg-video-chips- xserver-xorg-video-ati- xserver-xorg-video-radeon- xserver-xorg-video-mach64- xserver-xorg-video-r128- xserver-xorg-video-cirrus- xserver-xorg-video-ark- xserver-xorg-video-apm-"
 
 # device-specific values
@@ -572,8 +573,9 @@ fi
 echo " * Installing /root/.xsession"
 cat > $INST_DIR/root/.xsession <<__END__
 #!/bin/sh
+trayer --edge top &
+openmoko-panel-plugin &
 zhone &
-matchbox-keyboard-toggle &
 exec matchbox-window-manager -use_titlebar no -use_cursor no
 __END__
 

-- 
Various non-packaged files