update all dx2 related ini files

Signed-off-by: Anish Mangal <anish@sugarlabs.org>

5 files changed, 349 insertions, 87 deletions

diff --git a/examples/dextrose2-xo1-nognome-py-signed-sd.ini b/examples/dextrose2-xo1-nognome-py-signed-sd.ini
new file mode 100644
index 0000000..f0891be
--- /dev/null
+++ b/examples/dextrose2-xo1-nognome-py-signed-sd.ini
@@ -0,0 +1,250 @@
+; Dextrose2 F11-0.88 for the XO-1 (International without GNOME)
+;
+; Author: Steven M. Parrish <smparrish@gmail.com>
+
+[global]
+fedora_release=11
+olpc_version_major=10
+olpc_version_minor=2
+olpc_version_release=0
+target_platform=XO-1
+langs=en_US,es,es_PY,es_UY
+modules=
+	base,
+	xo1,
+	sd_card_image,
+	buildnr_from_file,
+	powerd,
+	repos,
+	yumcfg,
+	x11,
+	sugar,
+	sugarlabs_activities,
+	sugar_activities_extra,
+	custom_packages,
+	custom_scripts,
+	signing
+
+customization_info=Dextrose 2 Paraguay
+
+[repos]
+fedora=fedora,fedora-updates
+olpc_publicrpms_1=1,f11
+olpc_publicrpms_2=1,f11-xo1
+custom_repo_1=1,dextrose-dxo2,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms/i386/os
+custom_repo_2=1,dextrose-dxo2-freeworld,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms-freeworld/i386/os
+custom_repo_3=1,dextrose-dxo2-py,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms-py/i386/os
+custom_repo_4=1,dextrose-dxo2-py-local,http://repo.paraguayeduca.org/dxo2-py/i386/os
+custom_repo_5=1,dextrose-dxo2-py-local-testing,http://repo.paraguayeduca.org/dxo2-py-testing/i386/os
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+
+[sd_card_image]
+; 3965mb
+; size_1=3965190144
+; 1967mb
+size_1=1967128576
+
+[custom_packages]
+add_packages=
+	pulseaudio-module-x11,
+	gstreamer-plugins-bad,
+	gstreamer-plugins-ugly,
+	gstreamer-ffmpeg,
+	hunspell-es,
+	hunspell-pt,
+	liberation-mono-fonts,
+	liberation-serif-fonts,
+	liberation-sans-fonts,
+	telepathy-idle,
+	telepathy-sofiasip,
+	x11vnc,
+	chkconfig,
+	dextrose-updater,
+	dextrose-platform,
+	ipython,
+del_packages=
+	abyssinica-fonts,
+	at,
+	dos2unix,
+	dump,
+	finger,
+	ftp,
+	kacst-fonts,
+	khmeros-base-fonts,
+	krb5-workstation,
+	lohit-hindi-fonts,
+	mailx,
+	mlocate,
+	nafees-web-naskh-fonts,
+	nss_ldap,
+	quota,
+	pam_ccreds,
+	pam_passwdqc,
+	pam_smb,
+	readahead,
+	rdist,
+	rmt,
+	rsh,
+	talk,
+	tcp_wrappers,
+	tree,
+	smartmontools,
+	sos,
+	stunnel,
+	symlinks,
+	system-config-network-tui,
+;	system-config-firewall-tui,
+	unix2dos,
+	xfsprogs,
+	yp-tools,
+	ypbind,
+
+
+[yumcfg]
+addrepo_1=1,dextrose,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms/i386/os
+addrepo_2=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms-freeworld/i386/os
+addrepo_3=1,dextrose-py,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms-py/i386/os
+addrepo_4=1,dextrose-py-local,http://repo.paraguayeduca.org/dxo2-py/i386/os
+addrepo_5=1,dextrose-py-local-testing,http://repo.paraguayeduca.org/dxo2-py-testing/i386/os
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+
+
+[sugar]
+favorites_view_del=
+	org.laptop.Terminal,
+	org.laptop.Log,
+	org.laptop.StopWatchActivity,
+	org.laptop.sugar.ReadActivity
+favorites_view_add=
+	org.laptop.Words,
+	org.laptop.community.TypingTurtle,
+	org.laptop.physics,
+	org.sugarlabs.AbacusActivity,
+	org.gnome.Labyrinth,
+
+
+[sugarlabs_activities]
+sugar_version=0.88
+activities=
+	com.jotaro.ImplodeActivity,
+	edu.mit.media.ScratchActivity,
+	org.eq.FotoToon,
+;	org.laptop.AbiWordActivity,
+	org.laptop.Arithmetic,
+	org.laptop.Chat,
+	org.laptop.Log,
+	org.laptop.ImageViewerActivity,
+	org.laptop.MeasureActivity,
+	org.laptop.Memorize,
+
+;disabled because we're temporarily using record-87 having the ui-fixes
+;rebased over mainline/record-86
+;	org.laptop.RecordActivity,
+
+	org.laptop.StopWatchActivity,
+;	org.laptop.TamTamMini,
+	org.laptop.Terminal,
+	org.laptop.TurtleArtActivity,
+	org.laptop.Words,
+	org.laptop.community.Colors,
+	org.laptop.community.TypingTurtle,
+	org.laptop.physics,
+	org.laptop.sugar.GetBooksActivity,
+	org.laptop.sugar.ReadActivity,
+	org.sugarlabs.AbacusActivity,
+	org.vpri.EtoysActivity,
+;speak-21 is buggy
+;	vu.lux.olpc.Speak,
+	vu.lux.olpc.Maze,
+
+	org.laptop.community.tetrismat,
+	org.worldwideworkshop.olpc.FlipSticks,
+	com.laptop.Ruler,
+	org.laptop.community.TurtleMachine,
+	org.laptop.community.Spirolaterals,
+	org.worldwideworkshop.PollBuilder,
+
+	org.gnome.Labyrinth,
+	org.sugarlabs.VisualMatchActivity,
+	org.laptop.sugar.Jukebox,
+	org.laptop.Oficina,
+	com.garycmartin.Moon,
+
+;disabled because we're temporarily using Anish's fork with tabs
+;	org.laptop.WebActivity,
+
+; == bad activities ==
+
+;buggy on 0.84+
+;	com.laptop.Ruler,
+;
+;startup problems in 0.84+
+;	com.socialtext.SocialCalcActivity,
+;
+;marked experimental on ASLO because specific to f11 i386
+	net.gcompris,
+	org.tuxpaint,
+
+;requires sugar to be tolerant to non-sugar apps
+;	org.codewiz.XaoS,
+;
+;requires setting the clock:
+;	tv.alterna.Clock
+
+[sugar_activities_extra]
+;url_1=http://dev.laptop.org/~cjb/help-activity/Help-11.xo
+;bernie: does not work on 0.88?
+;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
+;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
+
+; m_anish's majestic Browse with tabs!
+url_50=http://people.sugarlabs.org/~anish/Browse-116.xo
+
+; record-87: record-79's ui fixes rebased over mainline/record-86
+url_51=http://people.sugarlabs.org/~anish/Record-87.xo
+
+; Including older versions as newer versions have bugs
+; Write-70
+url_52=http://activities.sugarlabs.org/en-US/sugar/downloads/file/26971/write-70.xo
+; TamTamMini-53
+url_53=http://activities.sugarlabs.org/en-US/sugar/downloads/file/27017/tamtammini-53.xo
+; Speak-20
+url_54=http://activities.sugarlabs.org/en-US/sugar/downloads/file/27182/speak-20.xo
+
+[powerd]
+; idle-suspend on XO-1 is not fully reliable. sometimes there are problems
+; with wifi after resume, and the resume delay is a little too noticable.
+enable_idle_suspend=0
+
+[buildnr_from_file]
+suffix=dx
+path=buildnr-dx
+
+
+[custom_scripts]
+custom_script_1=modules/custom_scripts/set_protected_list.sh
+custom_script_2=modules/custom_scripts/sugar_coredump.sh
+custom_script_3=modules/custom_scripts/libertas_debug.sh
+
+[base]
+versioned_fs=0
+prepopulate_run=0
+make_iso=0
+compress_iso=0
+make_tree_tarball=0
+python_optimize=2
+
+[signing]
+bios_crypto_path=/home/manish/bios-crypto
+skey=/home/manish/.olpc-keys/pys1
+okey=/home/manish/.olpc-keys/pyo1
+wkey=/home/manish/.olpc-keys/pyw
diff --git a/examples/dextrose2-xo1-nognome-py-signed.ini b/examples/dextrose2-xo1-nognome-py-signed.ini
index 71684c0..0fb80da 100644
--- a/examples/dextrose2-xo1-nognome-py-signed.ini
+++ b/examples/dextrose2-xo1-nognome-py-signed.ini
@@ -8,7 +8,7 @@ olpc_version_major=10
 olpc_version_minor=2
 olpc_version_release=0
 target_platform=XO-1
-langs=es,es_PY,es_UY,en_US
+langs=en_US,es,es_PY,es_UY
 modules=
 	base,
 	xo1,
@@ -25,7 +25,7 @@ modules=
 	custom_scripts,
 	signing
 
-customization_info=Paraguay
+customization_info=Dextrose 2 Paraguay
 
 [repos]
 fedora=fedora,fedora-updates
@@ -147,7 +147,8 @@ activities=
 	org.laptop.sugar.ReadActivity,
 	org.sugarlabs.AbacusActivity,
 	org.vpri.EtoysActivity,
-	vu.lux.olpc.Speak,
+;speak-21 is buggy
+;	vu.lux.olpc.Speak,
 	vu.lux.olpc.Maze,
 
 	org.laptop.community.tetrismat,
@@ -210,6 +211,8 @@ url_51=http://people.sugarlabs.org/~anish/Record-87.xo
 url_52=http://activities.sugarlabs.org/en-US/sugar/downloads/file/26971/write-70.xo
 ; TamTamMini-53
 url_53=http://activities.sugarlabs.org/en-US/sugar/downloads/file/27017/tamtammini-53.xo
+; Speak-20
+url_54=http://activities.sugarlabs.org/en-US/sugar/downloads/file/27182/speak-20.xo
 
 [powerd]
 ; idle-suspend on XO-1 is not fully reliable. sometimes there are problems
@@ -235,7 +238,7 @@ make_tree_tarball=0
 python_optimize=2
 
 [signing]
-bios_crypto_path=/home/anish/bios-crypto
-skey=/home/anish/.olpc-keys/pys1
-okey=/home/anish/.olpc-keys/pyo1
-wkey=/home/anish/.olpc-keys/pyw
+bios_crypto_path=/home/manish/bios-crypto
+skey=/home/manish/.olpc-keys/pys1
+okey=/home/manish/.olpc-keys/pyo1
+wkey=/home/manish/.olpc-keys/pyw
diff --git a/examples/dextrose2-xo1-nognome.ini b/examples/dextrose2-xo1-nognome.ini
index ce2980f..842ffed 100644
--- a/examples/dextrose2-xo1-nognome.ini
+++ b/examples/dextrose2-xo1-nognome.ini
@@ -51,6 +51,8 @@ add_packages=
 	x11vnc,
 	chkconfig,
 	dextrose-updater,
+	dextrose-platform,
+	ipython,
 del_packages=
 	abyssinica-fonts,
 	at,
@@ -98,19 +100,16 @@ add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [sugar]
 favorites_view_del=
-	org.laptop.Analyze,
 	org.laptop.Terminal,
 	org.laptop.Log,
-	org.laptop.Pippy,
 	org.laptop.StopWatchActivity,
 	org.laptop.sugar.ReadActivity
 favorites_view_add=
-	org.gnome.Labyrinth,
 	org.laptop.Words,
-	org.laptop.community.Finance,
 	org.laptop.community.TypingTurtle,
 	org.laptop.physics,
 	org.sugarlabs.AbacusActivity,
+	org.gnome.Labyrinth,
 
 
 [sugarlabs_activities]
@@ -119,50 +118,47 @@ activities=
 	com.jotaro.ImplodeActivity,
 	edu.mit.media.ScratchActivity,
 	org.eq.FotoToon,
-	org.gnome.Labyrinth,
-	org.laptop.AbiWordActivity,
-	org.laptop.AcousticMeasure,
+;	org.laptop.AbiWordActivity,
 	org.laptop.Arithmetic,
-	org.laptop.Analyze,
-	org.laptop.Calculate,
 	org.laptop.Chat,
-	org.laptop.Edit,
 	org.laptop.Log,
 	org.laptop.ImageViewerActivity,
 	org.laptop.MeasureActivity,
 	org.laptop.Memorize,
-	org.laptop.Oficina,
-	org.laptop.Pippy,
 
 ;disabled because we're temporarily using record-87 having the ui-fixes
 ;rebased over mainline/record-86
 ;	org.laptop.RecordActivity,
 
 	org.laptop.StopWatchActivity,
-	org.laptop.TamTamEdit,
-	org.laptop.TamTamJam,
-	org.laptop.TamTamMini,
-	org.laptop.TamTamSynthLab,
+;	org.laptop.TamTamMini,
 	org.laptop.Terminal,
 	org.laptop.TurtleArtActivity,
 	org.laptop.Words,
 	org.laptop.community.Colors,
-	org.laptop.community.Finance,
 	org.laptop.community.TypingTurtle,
 	org.laptop.physics,
-	org.laptop.sugar.GetIABooksActivity,
 	org.laptop.sugar.GetBooksActivity,
-	org.laptop.sugar.Jukebox,
 	org.laptop.sugar.ReadActivity,
-	org.laptop.xoEditorActivity,
 	org.sugarlabs.AbacusActivity,
-	org.sugarlabs.IRC,
-	org.sugarlabs.InfoSlicer,
-	org.sugarlabs.VisualMatchActivity,
 	org.vpri.EtoysActivity,
-	vu.lux.olpc.Speak,
+;speak-21 is buggy
+;	vu.lux.olpc.Speak,
 	vu.lux.olpc.Maze,
 
+	org.laptop.community.tetrismat,
+	org.worldwideworkshop.olpc.FlipSticks,
+	com.laptop.Ruler,
+	org.laptop.community.TurtleMachine,
+	org.laptop.community.Spirolaterals,
+	org.worldwideworkshop.PollBuilder,
+
+	org.gnome.Labyrinth,
+	org.sugarlabs.VisualMatchActivity,
+	org.laptop.sugar.Jukebox,
+	org.laptop.Oficina,
+	com.garycmartin.Moon,
+
 ;disabled because we're temporarily using Anish's fork with tabs
 ;	org.laptop.WebActivity,
 
@@ -175,9 +171,9 @@ activities=
 ;	com.socialtext.SocialCalcActivity,
 ;
 ;marked experimental on ASLO because specific to f11 i386
-;	net.gcompris,
-;	org.tuxpaint,
-;
+	net.gcompris,
+	org.tuxpaint,
+
 ;requires sugar to be tolerant to non-sugar apps
 ;	org.codewiz.XaoS,
 ;
@@ -189,22 +185,29 @@ activities=
 ;bernie: does not work on 0.88?
 ;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
-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_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
 
 ; m_anish's majestic Browse with tabs!
-url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
+url_50=http://people.sugarlabs.org/~anish/Browse-116.xo
 
 ; record-87: record-79's ui fixes rebased over mainline/record-86
 url_51=http://people.sugarlabs.org/~anish/Record-87.xo
 
+; Including older versions as newer versions have bugs
+; Write-70
+url_52=http://activities.sugarlabs.org/en-US/sugar/downloads/file/26971/write-70.xo
+; TamTamMini-53
+url_53=http://activities.sugarlabs.org/en-US/sugar/downloads/file/27017/tamtammini-53.xo
+; Speak-20
+url_54=http://activities.sugarlabs.org/en-US/sugar/downloads/file/27182/speak-20.xo
 
 [powerd]
 ; idle-suspend on XO-1 is not fully reliable. sometimes there are problems
diff --git a/examples/dextrose2-xo1.5-nognome-py-signed.ini b/examples/dextrose2-xo1.5-nognome-py-signed.ini
index 0eef7cb..dc8f9bd 100644
--- a/examples/dextrose2-xo1.5-nognome-py-signed.ini
+++ b/examples/dextrose2-xo1.5-nognome-py-signed.ini
@@ -40,7 +40,7 @@ olpc_publicrpms_2=1,f11-xo1.5
 custom_repo_1=1,dextrose-dxo2,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms/i386/os
 custom_repo_2=1,dextrose-dxo2-freeworld,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms-freeworld/i386/os
 custom_repo_3=1,dextrose-dxo2-py,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms-py/i386/os
-custom_repo_4=1,dextrose-dxo2-py-local,http://repo.paraguayeduca.org/dxo2-py/i386/os/
+custom_repo_4=1,dextrose-dxo2-py-local,http://repo.paraguayeduca.org/dxo2-py/i386/os
 custom_repo_5=1,dextrose-dxo2-py-local-testing,http://repo.paraguayeduca.org/dxo2-py-testing/i386/os
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
@@ -153,7 +153,8 @@ activities=
 	org.laptop.sugar.ReadActivity,
 	org.sugarlabs.AbacusActivity,
 	org.vpri.EtoysActivity,
-	vu.lux.olpc.Speak,
+;speak-21 is buggy
+;	vu.lux.olpc.Speak,
 	vu.lux.olpc.Maze,
 
 	org.laptop.community.tetrismat,
@@ -216,6 +217,8 @@ url_51=http://people.sugarlabs.org/~anish/Record-87.xo
 url_52=http://activities.sugarlabs.org/en-US/sugar/downloads/file/26971/write-70.xo
 ; TamTamMini-53
 url_53=http://activities.sugarlabs.org/en-US/sugar/downloads/file/27017/tamtammini-53.xo
+; Speak-20
+url_54=http://activities.sugarlabs.org/en-US/sugar/downloads/file/27182/speak-20.xo
 
 [powerd]
 ; should work well on the XO-1.5
@@ -240,7 +243,7 @@ make_tree_tarball=1
 python_optimize=2
 
 [signing]
-bios_crypto_path=/home/anish/bios-crypto
-skey=/home/anish/.olpc-keys/pys1
-okey=/home/anish/.olpc-keys/pyo1
-wkey=/home/anish/.olpc-keys/pyw
+bios_crypto_path=/home/manish/bios-crypto
+skey=/home/manish/.olpc-keys/pys1
+okey=/home/manish/.olpc-keys/pyo1
+wkey=/home/manish/.olpc-keys/pyw
diff --git a/examples/dextrose2-xo1.5-nognome.ini b/examples/dextrose2-xo1.5-nognome.ini
index 902dac9..8341c37 100644
--- a/examples/dextrose2-xo1.5-nognome.ini
+++ b/examples/dextrose2-xo1.5-nognome.ini
@@ -57,6 +57,8 @@ add_packages=
 	x11vnc,
 	chkconfig,
 	dextrose-updater,
+	dextrose-platform,
+	ipython,
 del_packages=
 	abyssinica-fonts,
 	at,
@@ -104,19 +106,16 @@ add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [sugar]
 favorites_view_del=
-	org.laptop.Analyze,
 	org.laptop.Terminal,
 	org.laptop.Log,
-	org.laptop.Pippy,
 	org.laptop.StopWatchActivity,
 	org.laptop.sugar.ReadActivity
 favorites_view_add=
-	org.gnome.Labyrinth,
 	org.laptop.Words,
-	org.laptop.community.Finance,
 	org.laptop.community.TypingTurtle,
 	org.laptop.physics,
 	org.sugarlabs.AbacusActivity,
+	org.gnome.Labyrinth,
 
 
 [sugarlabs_activities]
@@ -125,50 +124,47 @@ activities=
 	com.jotaro.ImplodeActivity,
 	edu.mit.media.ScratchActivity,
 	org.eq.FotoToon,
-	org.gnome.Labyrinth,
-	org.laptop.AbiWordActivity,
-	org.laptop.AcousticMeasure,
+;	org.laptop.AbiWordActivity,
 	org.laptop.Arithmetic,
-	org.laptop.Analyze,
-	org.laptop.Calculate,
 	org.laptop.Chat,
-	org.laptop.Edit,
 	org.laptop.Log,
 	org.laptop.ImageViewerActivity,
 	org.laptop.MeasureActivity,
 	org.laptop.Memorize,
-	org.laptop.Oficina,
-	org.laptop.Pippy,
 
 ;disabled because we're temporarily using record-87 having the ui-fixes
 ;rebased over mainline/record-86
 ;	org.laptop.RecordActivity,
 
 	org.laptop.StopWatchActivity,
-	org.laptop.TamTamEdit,
-	org.laptop.TamTamJam,
-	org.laptop.TamTamMini,
-	org.laptop.TamTamSynthLab,
+;	org.laptop.TamTamMini,
 	org.laptop.Terminal,
 	org.laptop.TurtleArtActivity,
 	org.laptop.Words,
 	org.laptop.community.Colors,
-	org.laptop.community.Finance,
 	org.laptop.community.TypingTurtle,
 	org.laptop.physics,
-	org.laptop.sugar.GetIABooksActivity,
 	org.laptop.sugar.GetBooksActivity,
-	org.laptop.sugar.Jukebox,
 	org.laptop.sugar.ReadActivity,
-	org.laptop.xoEditorActivity,
 	org.sugarlabs.AbacusActivity,
-	org.sugarlabs.IRC,
-	org.sugarlabs.InfoSlicer,
-	org.sugarlabs.VisualMatchActivity,
 	org.vpri.EtoysActivity,
-	vu.lux.olpc.Speak,
+;speak-21 is buggy
+;	vu.lux.olpc.Speak,
 	vu.lux.olpc.Maze,
 
+	org.laptop.community.tetrismat,
+	org.worldwideworkshop.olpc.FlipSticks,
+	com.laptop.Ruler,
+	org.laptop.community.TurtleMachine,
+	org.laptop.community.Spirolaterals,
+	org.worldwideworkshop.PollBuilder,
+
+	org.gnome.Labyrinth,
+	org.sugarlabs.VisualMatchActivity,
+	org.laptop.sugar.Jukebox,
+	org.laptop.Oficina,
+	com.garycmartin.Moon,
+
 ;disabled because we're temporarily using Anish's fork with tabs
 ;	org.laptop.WebActivity,
 
@@ -181,9 +177,9 @@ activities=
 ;	com.socialtext.SocialCalcActivity,
 ;
 ;marked experimental on ASLO because specific to f11 i386
-;	net.gcompris,
-;	org.tuxpaint,
-;
+	net.gcompris,
+	org.tuxpaint,
+
 ;requires sugar to be tolerant to non-sugar apps
 ;	org.codewiz.XaoS,
 ;
@@ -195,22 +191,29 @@ activities=
 ;bernie: does not work on 0.88?
 ;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
-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_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
 
 ; m_anish's majestic Browse with tabs!
-url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
+url_50=http://people.sugarlabs.org/~anish/Browse-116.xo
 
 ; record-87: record-79's ui fixes rebased over mainline/record-86
 url_51=http://people.sugarlabs.org/~anish/Record-87.xo
 
+; Including older versions as newer versions have bugs
+; Write-70
+url_52=http://activities.sugarlabs.org/en-US/sugar/downloads/file/26971/write-70.xo
+; TamTamMini-53
+url_53=http://activities.sugarlabs.org/en-US/sugar/downloads/file/27017/tamtammini-53.xo
+; Speak-20
+url_54=http://activities.sugarlabs.org/en-US/sugar/downloads/file/27182/speak-20.xo
 
 [powerd]
 ; should work well on the XO-1.5