[pkg-fso-maint] trayer removed, but still installed by install.sh

[Steffen Moeller]

Joachim Breitner wrote:
> Hi,
> 
> Am Freitag, den 21.08.2009, 18:18 +0200 schrieb Steffen Moeller:
>> Could you please be so kind to investigate for me if the following makes sense and works?
>> I cannot test it these days.
>>
>> --- a/install.sh
>> +++ b/install.sh
>> @@ -98,7 +98,8 @@ 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 \
>> +intern_trayer=stalonetray
>> +FSO_PACKAGES="matchbox-window-manager fso-frameworkd fso-gpsd openmoko-panel-plugin
>> dbus-x11 $intern_trayer 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
>> @@ -1123,9 +1124,14 @@ __END__
>>         chroot "$INST_DIR" apt-get $APT_OPTIONS install dash
>>
>>         echo " * Installing /root/.xsession"
>> +       if [ "trayer" = "$intern_trayer" ]; then
>> +               $intern_trayer_invocation="$intern_trayer --edge top &"
>> +       else
>> +               $intern_trayer_invocation="$intern_trayer &"
>> +       fi
>>         cat > "$INST_DIR/root/.xsession" <<EOMATCHBOX
>>  #!/bin/sh
>> -trayer --edge top &
>> +$intern_trayer_invocation
>>  openmoko-panel-plugin &
>>  zhone &
>>  exec matchbox-window-manager -use_titlebar no -use_cursor no
> 
> if trayer is gone from the archive, there is no point in adding extra
> logic to install.sh for it. Just find a suitable alternative and put it
> in the installer.

It is still with two debian ports (m68k and another). We don't package it ourselves, this
means, right?

I'll simplify above patch then and submit it. Thanks to Sascha and Olivier for their
constructive testing and hunting.

Cheers,

Steffen