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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit daa37b9e963be9dd38d5a62af476bc551266cbe6
Merge: e495f75310a4fe7e2a14af34e8277155b8789be4 79f709ca997f4a21549b774cca95e9e5deb6d15f
Author: Steffen Moeller <moeller at debian.org>
Date:   Wed May 5 22:35:46 2010 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-fso/files

diff --combined install.sh
index 642ae10,02f2843..a9e516f
--- a/install.sh
+++ b/install.sh
@@@ -116,6 -116,7 +116,7 @@@ FSO_PACKAGES="matchbox-window-manager f
  console-setup xserver-xorg-core xserver-xorg-video-fbdev xserver-xorg-input-tslib xterm xinit xfonts-base x11-xserver-utils"
  
  # well-suited software for the FreeRunner
+ PACKAGES_TASK_AUDIO="intone"
  PACKAGES_TASK_GAMES="mokomaze sgt-puzzles"
  PACKAGES_TASK_GPS="tangogps navit"
  PACKAGES_TASK_COM="zhone pidgin"
@@@ -125,7 -126,7 +126,7 @@@ PACKAGES_TASK_WEB="midori epdfview
  PACKAGES_TASK_WIFI="dhcp3-client wpasupplicant wireless-tools"
  PACKAGES_TASK_UTILS="scrot debfoster"
  # tasks defined
- intern_tasks_defined="GAMES,GPS,COM,NET,TEXT,WEB,WIFI,UTILS"
+ intern_tasks_defined="AUDIO,GAMES,GPS,COM,NET,TEXT,WEB,WIFI,UTILS"
  
  # device-specific values
  UBOOT_ENV_SIZE=262144
@@@ -390,13 -391,14 +391,14 @@@ ENVIRONMEN
  	fso          Install freesmartphone.org packages (by default this
                       also include the Zhone GUI, see the ZHONE variable)
  	tasks        Installs packages for a series of tasks. Supported are
+                        AUDIO  ($PACKAGES_TASK_AUDIO)
                         COM    software supporting the communication of
                                users ($PACKAGES_TASK_COM).  zhone is always
                                installed.
                         GAMES  installs games that were designed with
                                FreeRunner-like devices in mind or that have
                                been found compatible ($PACKAGES_TASK_GAMES)
-                        GPS    Software for GPS, geocaching and navigation
+                        GPS    software for GPS, geocaching and navigation
                                ($PACKAGES_TASK_GPS)
                         NET    software that is beneficial to investigate
                                the network setup and/or forward traffic
@@@ -632,7 -634,7 +634,7 @@@ action_testing () 
  	done
  
  	if [ -n "$intern_packages_missing" ]; then
 -		echo "E: Could not find the following binaries: $intern_packages_missing.$intern_extra_information"
 +		echo -e "E: Could not find the following binaries: $intern_packages_missing.$intern_extra_information"
  		exit 1
  	fi
  

-- 
Various non-packaged files