Latest tweaks

3 files changed, 25 insertions, 16 deletions

diff --git a/etc/sweets.conf b/etc/sweets.conf
index 3590589..5818062 100644
--- a/etc/sweets.conf
+++ b/etc/sweets.conf
@@ -1,6 +1,6 @@
 [shell]
 # space separated list of plugins to enable
-plugins = telepathy proxy sn
+plugins = telepathy proxy sn stats
 
 # Sugar Network client configuration
 # http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Implementation#sugar-network-client
diff --git a/image/common.ini b/image/common.ini
index d8affe8..5b14377 100644
--- a/image/common.ini
+++ b/image/common.ini
@@ -7,6 +7,9 @@
 # Put your title here.
 customization_info = Hexoquinasa v1.0 BETA3
 
+# Languages to include
+langs=es,en_US,pt,pt_BR,fr,de,qu,ayc,quz
+
 # Image filename.
 # String should contain one formatting argument to make Python expression,
 # `image_name % latestbuild`, valid. Make sure that you escaped `%` symbol
@@ -16,7 +19,7 @@ image_name = hxp%%d
 # Minimal list of required modules.
 # All of the following modules need to be added to keep final image consistent.
 # `*sugar*` modules are not included on purpose, Sugar related configuration
-# will happen in `sweets-deployment` package added by `sweets` module.
+# will happen in `deployment.rpm` added from [custom_packages] section.
 modules_required =
     base,
     repos,
@@ -44,15 +47,14 @@ modules_extra =
 path = latestbuild
 
 [sweets]
-# Name of Sweets Distribution repository current one is based on.
-# http://wiki.sugarlabs.org/go/Template:Sweets_Distribution_Linkbar
-sweets_repository = 0.94:SugarNetwork
-
-# Url to downstream repository. Put your url here.
-deployment_repository_url = http://download.sugarlabs.org/packages//Hexoquinasa:/1/SweetsDistribution_0.94_SugarNetwork_Fedora-14/
-
-# List of bundle_ids (or context GUIDs in Sugar Network terms) of activities
-# to prefetch to final image to make them accessible in offline right after
+# OBS repository on packages.sugarlabs.org with downstream extra packages.
+# This repository will be used to install packages during image building,
+# and, for post-image system upgrades. Repository should be in form of:
+# <OBS_PROJECT>:<OBS_REPOSITORY>
+deployment_repository = Hexoquinasa:1/SweetsDistribution_0.94_SugarNetwork_Fedora-14
+ 
+# List of bundle_ids (or Context GUIDs in Sugar Network terms) of activities
+# to prefetch to the final image to make them accessible in offline right after
 # flasing. These activities should exist in the Sugar Network. If activities
 # were formed properly, their dependencies will be automatically installed.
 # Put your activities list here.
@@ -75,9 +77,9 @@ offline_activities =
     org.laptop.RecordActivity,
     org.laptop.Oficina,
     com.jotaro.ImplodeActivity,
-    org.laptop.physics,
+#    org.laptop.physics,
     org.laptop.MeasureActivity,
-    org.laptop.VncLauncher,
+    org.somosazucar.ServidorVNC,
 #net.gcompris,
     edu.mit.media.ScratchActivity,
     org.ceibaljam.conozcoamerica,
@@ -88,10 +90,9 @@ offline_activities =
     org.laptop.WikipediaActivity,
     mulawa.Sudoku
 
-# List of bundle_ids (or context GUIDs in Sugar Network terms) of activities
+# List of bundle_ids (or Context GUIDs in Sugar Network terms) of activities
 # make them favorited in Sugar Shell Home view. These activities need
 # to be mentioned in `offline_activities` option as well.
-# Put your activities list here.
 favorite_activities =
     org.laptop.WebActivity,
     org.laptop.WikipediaActivity,
@@ -100,13 +101,19 @@ favorite_activities =
     org.laptop.Chat,
     org.laptop.TurtleArtActivity,
     org.laptop.AbiWordActivity,
-    org.laptop.physics,
+#    org.laptop.physics,
     org.laptop.TamTamMini,
     org.ceibaljam.conozcoamerica,
+    vu.lux.olpc.Speak,
     org.laptop.Terminal
 
 [custom_packages]
 add_packages =
+#   Deployment package which fetches all required dependencies and contains
+#   proper configuration. Post-image support will happen by updating
+#   `deployment.rpm` and spreading it via Sugar Network nodes.
+    deployment,
+    sugar-plugin-stats,
 #   Useful packages from rpmfusion repository.
     gstreamer-plugins-ugly,
     gstreamer-ffmpeg,
diff --git a/image/post.sh b/image/post.sh
index b41e451..636612d 100755
--- a/image/post.sh
+++ b/image/post.sh
@@ -12,3 +12,5 @@ echo Installing boot-anim
 mkdir -p usr/share/boot-anim
 cp $src_root/../boot_logo/frame00.565  usr/share/boot-anim/
 
+mkdir -p home/olpc/Activities
+unzip -d home/olpc/Activities $src_root/../activities/Physics-11.6.xo