F14 configs: use activities.sugarlabs.org for more activities

And sync the XO-1 activities with G1G1Lite/10.1.3.

2 files changed, 41 insertions, 25 deletions

diff --git a/examples/f14-xo1.5.ini b/examples/f14-xo1.5.ini
index db24c0c..41adc2d 100644
--- a/examples/f14-xo1.5.ini
+++ b/examples/f14-xo1.5.ini
@@ -55,7 +55,8 @@ favorites_view_add=
 
 [sugarlabs_activities]
 sugar_version=0.90
-activities=org.laptop.AbiWordActivity,
+activities=org.laptop.HelpActivity,
+	org.laptop.AbiWordActivity,
 	org.laptop.Oficina,
 	org.laptop.TamTamSynthLab,
 	org.laptop.TamTamJam,
@@ -74,24 +75,23 @@ activities=org.laptop.AbiWordActivity,
 	org.laptop.ImageViewerActivity,
 	org.laptop.community.Colors,
 	org.laptop.community.Finance,
-	org.laptop.AcousticMeasure
+	org.laptop.AcousticMeasure,
+	org.laptop.WebActivity,
+	org.vpri.EtoysActivity,
+	org.laptop.MeasureActivity,
+	vu.lux.olpc.Maze,
+	com.garycmartin.Moon,
+	edu.mit.media.ScratchActivity,
+	org.laptop.Terminal,
+	org.laptop.Log,
+	org.laptop.community.TypingTurtle,
+	org.sugarlabs.InfoSlicer,
+	org.laptop.StopWatchActivity
 
-; temporarily dropped due to not being 0.90-compatible:
-;org.laptop.WebActivity
+; dropped until 0.90-compatible
 ;org.laptop.sugar.ReadActivity
-;org.vpri.EtoysActivity
-;org.laptop.MeasureActivity
-;vu.lux.olpc.Maze
-;com.garycmartin.Moon
-;edu.mit.media.ScratchActivity
-;org.laptop.Terminal
-;org.laptop.Log
-;org.laptop.community.TypingTurtle
-;org.sugarlabs.InfoSlicer
-;org.laptop.StopWatchActivity
 
 [sugar_activities_extra]
-url_1=http://dev.laptop.org/~cjb/help-activity/Help-11.xo
 url_2=http://dev.laptop.org/~sayamindu/GetBooks-5.xo
 url_3=http://dev.laptop.org/~cjb/eswiki/0.84/Wikipedia-20.xo
 url_4=http://dev.laptop.org/~cjb/enwiki/0.84/WikipediaEN-20.xo
diff --git a/examples/f14-xo1.ini b/examples/f14-xo1.ini
index 7513b41..fdd73f3 100644
--- a/examples/f14-xo1.ini
+++ b/examples/f14-xo1.ini
@@ -15,6 +15,7 @@ modules=
 	x11,
 	sugar,
 	sugarlabs_activities,
+	sugar_activities_extra,
 	gnome
 
 [repos]
@@ -44,18 +45,33 @@ activities=org.laptop.AbiWordActivity,
 	org.laptop.Memorize,
 	com.jotaro.ImplodeActivity,
 	vu.lux.olpc.Speak,
-	org.laptop.AcousticMeasure
+	org.laptop.AcousticMeasure,
+	org.laptop.WebActivity,
+	org.vpri.EtoysActivity,
+	org.laptop.MeasureActivity,
+	vu.lux.olpc.Maze,
+	com.garycmartin.Moon,
+	edu.mit.media.ScratchActivity,
+	org.laptop.Terminal,
+	org.laptop.Log,
+	org.laptop.HelpActivity,
+	org.laptop.sugar.Jukebox,
+	org.laptop.ImageViewerActivity
 
-; temporarily dropped due to not being 0.90-compatible:
-;org.laptop.WebActivity
+; dropped until 0.90-compatible
 ;org.laptop.sugar.ReadActivity
-;org.vpri.EtoysActivity
-;org.laptop.MeasureActivity
-;vu.lux.olpc.Maze
-;com.garycmartin.Moon
-;edu.mit.media.ScratchActivity
-;org.laptop.Terminal
-;org.laptop.Log
+
+[sugar_activities_extra]
+url_6=http://wiki.laptop.org/images/3/3c/Biology-9.xol
+url_7=http://wiki.laptop.org/images/7/77/Wikibooks-8.xol
+url_8=http://wiki.laptop.org/images/5/5e/NatureImages-8.xol
+url_9=http://wiki.laptop.org/images/9/9e/JamendoMusic-5.xol
+url_10=http://wiki.laptop.org/images/0/05/TranslationDictionary-8.xol
+url_11=http://wiki.laptop.org/images/3/34/ICDL-8.xol
+url_12=http://wiki.laptop.org/images/a/af/WorldFactbookMaps-6.xol
+url_13=http://wiki.laptop.org/images/f/fe/WikisliceChemistry-en-8.xol
+url_14=http://dev.laptop.org/~sj/WorldDigitalLibrary-5.xol
+url_15=http://dev.laptop.org/~dsd/record/Record-86.xo
 
 [buildnr_from_file]
 path=latestbuild