From 927706bf567b41afdfd8e607ed5657a7cecd9479 Mon Sep 17 00:00:00 2001
From: Sebastian Dziallas <sebastian@when.com>
Date: Thu, 25 Mar 2010 21:44:43 +0100
Subject: [PATCH] soas: sync with latest changes from sugar labs' git

---
 fedora-livecd-soas.ks | 128 ++++++++++++++++++++++++------------------
 1 file changed, 72 insertions(+), 56 deletions(-)

diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index cbc6b71..26bf1d4 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -1,4 +1,4 @@
-# sugar-on-a-stick.ks
+# fedora-livecd-soas.ks
 #
 # Description:
 # - A Sugar environment that you can carry in your pocket
@@ -6,73 +6,79 @@
 # Maintainers:
 # - Sebastian Dziallas <sdz AT fedoraproject DOT org>
 # - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Mel Chua <mchua AT fedoraproject DOT org>
 
 %include fedora-live-mini.ks
 
 %packages
 
-# core sugar platform
-@sugar-desktop
+# == core sugar platform ==
+sugar
 
-# sugar activities
-sugar-analyze
-sugar-clock
-sugar-connect
-sugar-distance
-sugar-finance
-sugar-flipsticks
-sugar-getiabooks
-sugar-implode
-sugar-infoslicer
-sugar-maze
-sugar-memorize
-sugar-moon
-sugar-physics
-sugar-playgo
-sugar-record
-sugar-speak
-sugar-stopwatch
-sugar-tamtam-edit
-sugar-tamtam-jam
-sugar-tamtam-mini
-sugar-tamtam-synthlab
-sugar-typing-turtle
-sugar-xoirc
-sugar-visualmatch
-
-# internet
-alpine
-
-# multimedia
-csound-python
-evince-djvu
-gnash-plugin
-gtk-recordmydesktop
-
-# system
-PackageKit-browser-plugin
-gdm
-gnome-power-manager
-gnugo
-gparted
-gvfs
-livecd-tools
-xulrunner-python
-zyx-liveinstaller
-
-# hardware
-b43-openfwwf
-libertas-usb8388-firmware
-
-# sound
+# == platform components ==
+# from http://wiki.sugarlabs.org/go/0.88/Platform_Components
 alsa-plugins-pulseaudio
 alsa-utils
+etoys
+csound-python
+evince-djvu
 gstreamer-plugins-good
 gstreamer-plugins-espeak
 gstreamer-plugins-bad-free
 pulseaudio
 
-# fonts
+# == sugar activities ==
+sugar-browse # Because they need this to install activities.
+sugar-log # Because they need this for debugging.
+sugar-terminal # Because this makes debugging easier.
+sugar-turtleart # Because this is a great demo example (extended demo).
+sugar-xoirc # Because this helps us help them.
+
+# == Activities from ASLO ==
+# These are activities we're going to polish to the same level
+# as the ones included in the SoaS image, but encourage people
+# to download from ASLO as part of the SoaS experience of exploring
+# other Activities in there.
+
+# etoys-sugar
+# sugar-maze
+# sugar-speak
+# sugar-tamtam-*
+# sugar-visualmatch
+
+# These are Activities that aren't quite there, but are important,
+# so we're going to encourage people to test them.
+
+# sugar-write
+# sugar-record
+# sugar-pippy
+# sugar-read
+
+# == system ==
+# automatically logs in the liveuser
+# replace this with nodm for v4
+# http://bugs.sugarlabs.org/ticket/1849
+gdm
+
+# needed to show external hard drives
+gvfs
+
+# needed for battery monitoring and power management in sugar
+gnome-power-manager
+
+# we can haz sugar boot screen
+-plymouth-system-theme
+-plymouth-theme-charge
+sugar-logos
+
+# == hardware ==
+# lets support broadcom and xo wifi hardware
+b43-openfwwf
+libertas-usb8388-firmware
+
+# == fonts ==
+# more font support
+# http://bugs.sugarlabs.org/ticket/1119
 google-droid-fonts-common
 google-droid-sans-fonts
 google-droid-sans-mono-fonts
@@ -92,7 +98,17 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults
 # set sugar power management on
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
 
-# set up timed auto-login for after 60 seconds
+# add our activities to the favorites
+cat > /usr/share/sugar/data/activities.defaults << FOE
+org.laptop.WebActivity
+org.laptop.Log
+org.laptop.physics
+org.laptop.Terminal
+org.laptop.TurtleArtActivity
+org.sugarlabs.IRC
+FOE
+
+# set up auto-login for for liveuser
 cat >> /etc/gdm/custom.conf << FOE
 [daemon]
 AutomaticLoginEnable=true