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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit db8ab78c686af2f852d4de337ed1b9c60109cf6c
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Thu Feb 19 23:43:36 2009 +0100

    Removed matchbox/fbpanel selection

diff --git a/install.sh b/install.sh
index 9e109af..6599e89 100755
--- a/install.sh
+++ b/install.sh
@@ -54,10 +54,9 @@ FSO_DEVICE=${FSO_DEVICE:-gta02}
 QI=${QI:-false}
 QI_VERBOSE_BOOT=${QI_VERBOSE_BOOT:-false}
 SINGLE_PART=${SINGLE_PART:-$QI}
-WINDOW_MANAGER=${WINDOW_MANAGER:-zhone}
 
 # hardening for the case that a user uses capitals
-lc SD_PART1_FS SD_PART2_FS APT_RECOMMENDS QI QI_VERBOSE_BOOT WINDOW_MANAGER FSO_DEVICE
+lc SD_PART1_FS SD_PART2_FS APT_RECOMMENDS QI QI_VERBOSE_BOOT FSO_DEVICE
 
 ### sanity check until the GTA01 installer will be merged
 if [ "${FSO_DEVICE}" != gta02 ]; then
@@ -206,9 +205,6 @@ DESCRIPTION
                      do this only when QI=true (default to false)
 	SINGLE_PART  set this to true if only one partition should be created
                      this is true by default for QI=true and false if SD_PART1_FS=vfat
-	WINDOW_MANAGER   the presentation of the phone to the user. The default is
-                     to just use the 'zhone' (phone) application. Alternatively,
-                     'fbpanel' is a tiny but usable window manager.
 
     Stages:
 
@@ -754,6 +750,7 @@ __END__
 	fi
 
 else
+	# $SINGLE_PART = "true"
 
 	if [ 0 -lt "$SD_SWAP_SIZE" ]; then
 		cat >> $INST_DIR/etc/fstab <<__END__
@@ -803,35 +800,13 @@ if [ -f "$WPA_SUPPLICANT_CONF" ]; then
 fi
 
 echo " * Installing /root/.xsession"
-if [ "fbpanel" = "$WINDOW_MANAGER" ]; then
-	# from http://wiki.openmoko.org/wiki/Debian#Matchbox_with_fbpanel
-	apt-get -yes install fbpanel
-	cat > $INST_DIR/root/.xsession <<EOFBPANEL
-#!/bin/sh
-export GTK_MODULES=libgtkstylus.so
-zhone &
-xsetroot -solid black
-matchbox-keyboard-toggle &
-matchbox-window-manager -use_titlebar yes &
-# -use_titlebar yes to minimize & toggle between apps
-# fbpanel's taskbar does not work with matchbox-window-manager
-#~/bin/auxlaunch &
-while true;
-do
-fbpanel;
-sleep 1;
-done;
-EOFBPANEL
-
-else
-
-	cat > $INST_DIR/root/.xsession <<EOZHONE
+cat > $INST_DIR/root/.xsession <<EOMATCHBOX
 #!/bin/sh
 trayer --edge top &
 openmoko-panel-plugin &
 zhone &
 exec matchbox-window-manager -use_titlebar no -use_cursor no
-EOZHONE
+EOMATCHBOX
 
 fi
 

-- 
Various non-packaged files