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

[Joachim Breitner]

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.

Gruß,
Joachim

-- 
Joachim "nomeata" Breitner
Debian Developer
  nomeata at debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C
  JID: nomeata at joachim-breitner.de | http://people.debian.org/~nomeata
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
URL: <http://lists.alioth.debian.org/pipermail/pkg-fso-maint/attachments/20090821/921254e7/attachment-0001.pgp>