Merge eduteam builds with the nognome builds

4 files changed, 24 insertions, 482 deletions

diff --git a/examples/f11-0.88-xo1-py-nognome-eduteam.ini b/examples/f11-0.88-xo1-py-nognome-eduteam.ini
deleted file mode 100644
index 26a5209..0000000
--- a/examples/f11-0.88-xo1-py-nognome-eduteam.ini
+++ /dev/null
@@ -1,184 +0,0 @@
-; Dextrose F11-0.88 for the XO-1, customized for Paraguay (without GNOME + Activities list)
-;
-; Author: Bernie Innocenti <bernie@codewiz.org>
-; Author: Martin Abente <mabente@paraguayeduca.org>
-
-[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
-modules=
-	base,
-	xo1,
-	jffs2_image,
-	buildnr_from_file,
-	library_homepage,
-	powerd,
-	repos,
-	yumcfg,
-	x11,
-	sugar,
-	sugarlabs_activities,
-	sugar_activities_extra,
-	custom_packages,
-	custom_scripts,
-	oats_cfg,
-	signing
-
-customization_info=Paraguay
-
-[repos]
-fedora=fedora,fedora-updates
-olpc_publicrpms_1=1,f11
-custom_repo_1=1,dextrose-f11-0.88,http://download.sugarlabs.org/dextrose/testing/f11-0.88/rpms/i386/os
-custom_repo_2=1,f11-freeworld,http://repo.paraguayeduca.org/f11-freeworld/i386/os
-add_excludes_to=fedora,fedora-updates,fedora-updates-testing
-
-[custom_packages]
-add_packages=
-	pulseaudio-module-x11,
-	gstreamer-plugins-bad,
-	gstreamer-plugins-ugly,
-	gstreamer-ffmpeg,
-	hunspell-es,
-	liberation-mono-fonts,
-	liberation-serif-fonts,
-	liberation-sans-fonts,
-	telepathy-idle,
-	telepathy-sofiasip,
-	x11vnc,
-	chkconfig,
-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/f11-0.88/rpms/i386/os
-addrepo_2=1,f11-freeworld,http://repo.paraguayeduca.org/f11-freeworld/i386/os
-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.laptop.AbiWordActivity,
-	org.laptop.Oficina,
-	org.laptop.WebActivity,
-	org.laptop.RecordActivity,
-	org.laptop.TurtleArtActivity,
-	vu.lux.olpc.Speak,
-	org.laptop.Chat,
-	org.laptop.TamTamMini
-
-
-[sugarlabs_activities]
-sugar_version=0.88
-activities=
-	org.laptop.AbiWordActivity,
-	org.laptop.Oficina,
-	org.laptop.sugar.ReadActivity,
-	org.laptop.RecordActivity,
-	edu.mit.media.ScratchActivity,
-	org.laptop.TurtleArtActivity,
-	org.vpri.EtoysActivity,
-	org.gnome.Labyrinth,
-	org.laptop.Memorize,
-	org.worldwideworkshop.olpc.JigsawPuzzle,
-	org.laptop.Terminal,
-	vu.lux.olpc.Speak,
-	org.sugarlabs.AbacusActivity,
-	org.laptop.ImageViewerActivity,
-	org.laptop.Chat,
-	org.sugarlabs.VisualMatchActivity,
-	org.worldwideworkshop.PollBuilder,
-	org.laptop.TamTamMini
-
-;marked experimental on ASLO because specific to f11 i386
-;	net.gcompris,
-;	org.tuxpaint,
-;
-
-[sugar_activities_extra]
-; m_anish's majestic Browse with tabs!
-url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
-url_51=http://people.sugarlabs.org/~bernie/sugar/activities/gcompris-15.xo
-url_52=http://people.sugarlabs.org/~bernie/sugar/activities/tux_paint-5.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=py
-path=oob-buildnr-0.88
-
-[signing]
-bios_crypto_path=bios-crypto
-skey=/home/bernie/src/olpc/keys/pys1
-okey=/home/bernie/src/olpc/keys/pyo1
-wkey=/home/bernie/src/olpc/keys/pyw1
-
-[oats_cfg]
-server=mothership.oficina.paraguayeduca.org
-ignore_xs=1
-
-[library_homepage]
-path=library-customization
-
-[custom_scripts]
-custom_script_1=modules/custom_scripts/set_protected_list.sh
-custom_script_2=modules/custom_scripts/libertas_debug.sh
-
-[base]
-;versioned_fs=1
-;prepopulate_run=1
-versioned_fs=0
-prepopulate_run=0
-make_iso=0
-compress_iso=0
-make_tree_tarball=0
-python_optimize=2
diff --git a/examples/f11-0.88-xo1-py-nognome.ini b/examples/f11-0.88-xo1-py-nognome.ini
index 148ff8a..28a48ed 100644
--- a/examples/f11-0.88-xo1-py-nognome.ini
+++ b/examples/f11-0.88-xo1-py-nognome.ini
@@ -1,6 +1,7 @@
 ; Dextrose F11-0.88 for the XO-1, customized for Paraguay (without GNOME)
 ;
 ; Author: Bernie Innocenti <bernie@codewiz.org>
+; Author: Martin Abente <mabente@paraguayeduca.org>
 
 [global]
 fedora_release=11
@@ -103,85 +104,46 @@ favorites_view_del=
 	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.laptop.AbiWordActivity,
+	org.laptop.Chat,
+	org.laptop.Oficina,
+	org.laptop.RecordActivity,
+	org.laptop.TamTamMini
+	org.laptop.TurtleArtActivity,
+	org.laptop.WebActivity,
+	vu.lux.olpc.Speak,
 
 
 [sugarlabs_activities]
 sugar_version=0.88
 activities=
-	com.jotaro.ImplodeActivity,
 	edu.mit.media.ScratchActivity,
-	org.eq.FotoToon,
 	org.gnome.Labyrinth,
 	org.laptop.AbiWordActivity,
-	org.laptop.AcousticMeasure,
-	org.laptop.Arithmetic,
-	org.laptop.Analyze,
-	org.laptop.Calculate,
 	org.laptop.Chat,
-	org.laptop.Log,
 	org.laptop.ImageViewerActivity,
-	org.laptop.MeasureActivity,
 	org.laptop.Memorize,
 	org.laptop.Oficina,
-	org.laptop.Pippy,
 	org.laptop.RecordActivity,
-	org.laptop.StopWatchActivity,
-	org.laptop.TamTamEdit,
-	org.laptop.TamTamJam,
 	org.laptop.TamTamMini,
-	org.laptop.TamTamSynthLab,
 	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.sugarlabs.AbacusActivity,
-	org.sugarlabs.IRC,
-	org.sugarlabs.InfoSlicer,
 	org.sugarlabs.VisualMatchActivity,
 	org.vpri.EtoysActivity,
 	vu.lux.olpc.Speak,
+	org.worldwideworkshop.PollBuilder,
+	org.worldwideworkshop.olpc.JigsawPuzzle,
 
 ;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,
-;
-;untested on 0.88:
-;	org.worldwideworkshop.PollBuilder,
-;	org.worldwideworkshop.olpc.JigsawPuzzle,
-;	org.worldwideworkshop.olpc.SliderPuzzle,
-;	tv.alterna.Clock
 
 [sugar_activities_extra]
-url_10=http://wiki.laptop.org/images/0/05/TranslationDictionary-8.xol
-url_13=http://wiki.laptop.org/images/f/fe/WikisliceChemistry-en-8.xol
-
 ; m_anish's majestic Browse with tabs!
 url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
 url_51=http://people.sugarlabs.org/~bernie/sugar/activities/gcompris-15.xo
diff --git a/examples/f11-0.88-xo1.5-py-nognome-eduteam.ini b/examples/f11-0.88-xo1.5-py-nognome-eduteam.ini
deleted file mode 100644
index 5204271..0000000
--- a/examples/f11-0.88-xo1.5-py-nognome-eduteam.ini
+++ /dev/null
@@ -1,188 +0,0 @@
-; Dextrose F11-0.88 for the XO-1.5, customized for Paraguay (without GNOME)
-;
-; Author: Bernie Innocenti <bernie@codewiz.org>
-; Author: Martin Abente <mabente@paraguayeduca.org>
-
-[global]
-fedora_release=11
-olpc_version_major=10
-olpc_version_minor=2
-olpc_version_release=0
-target_platform=XO-1.5
-langs=en_US,es,es_PY
-modules=
-	base,
-	xo1_5,
-	sd_card_image,
-	buildnr_from_file,
-	library_homepage,
-	powerd,
-	repos,
-	yumcfg,
-	x11,
-	sugar,
-	sugarlabs_activities,
-	sugar_activities_extra,
-	custom_packages,
-	custom_scripts,
-	oats_cfg,
-	signing
-
-customization_info=Paraguay
-
-[sd_card_image]
-; 4GB image
-size_1=3865470566
-; 2GB image
-;size_2=1932735283,2gb
-
-[repos]
-fedora=fedora,fedora-updates
-olpc_publicrpms_1=1,f11
-olpc_publicrpms_2=1,f11-xo1.5
-custom_repo_1=1,dextrose-f11-0.88,http://download.sugarlabs.org/dextrose/testing/f11-0.88/rpms/i386/os
-custom_repo_2=1,f11-freeworld,http://repo.paraguayeduca.org/f11-freeworld/i386/os
-add_excludes_to=fedora,fedora-updates,fedora-updates-testing
-
-[custom_packages]
-add_packages=
-	pulseaudio-module-x11,
-	gstreamer-plugins-bad,
-	gstreamer-plugins-ugly,
-	gstreamer-ffmpeg,
-	hunspell-es,
-	liberation-mono-fonts,
-	liberation-serif-fonts,
-	liberation-sans-fonts,
-	telepathy-idle,
-	telepathy-sofiasip,
-	x11vnc,
-	chkconfig,
-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/f11-0.88/rpms/i386/os
-addrepo_2=1,f11-freeworld,http://repo.paraguayeduca.org/f11-freeworld/i386/os
-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,
-
-
-[sugarlabs_activities]
-sugar_version=0.88
-activities=
-	org.laptop.AbiWordActivity,
-	org.laptop.Oficina,
-	org.laptop.sugar.ReadActivity,
-	org.laptop.RecordActivity,
-	edu.mit.media.ScratchActivity,
-	org.laptop.TurtleArtActivity,
-	org.vpri.EtoysActivity,
-	org.gnome.Labyrinth,
-	org.laptop.Memorize,
-	org.worldwideworkshop.olpc.JigsawPuzzle,
-	org.laptop.Terminal,
-	vu.lux.olpc.Speak,
-	org.sugarlabs.AbacusActivity,
-	org.laptop.ImageViewerActivity,
-	org.laptop.Chat,
-	org.sugarlabs.VisualMatchActivity,
-	org.worldwideworkshop.PollBuilder,
-	org.laptop.TamTamMini
-
-;marked experimental on ASLO because specific to f11 i386
-;	net.gcompris,
-;	org.tuxpaint,
-;
-
-[sugar_activities_extra]
-; m_anish's majestic Browse with tabs!
-url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
-url_51=http://people.sugarlabs.org/~bernie/sugar/activities/gcompris-15.xo
-url_52=http://people.sugarlabs.org/~bernie/sugar/activities/tux_paint-5.xo
-
-[powerd]
-; should work well on the XO-1.5, but disabled just in case
-enable_idle_suspend=0
-
-[buildnr_from_file]
-suffix=py
-path=oob-buildnr-0.88
-
-[signing]
-bios_crypto_path=bios-crypto
-skey=/home/bernie/src/olpc/keys/pys1
-okey=/home/bernie/src/olpc/keys/pyo1
-wkey=/home/bernie/src/olpc/keys/pyw1
-
-[oats_cfg]
-server=mothership.oficina.paraguayeduca.org
-ignore_xs=1
-
-[library_homepage]
-path=library-customization
-
-[custom_scripts]
-custom_script_1=modules/custom_scripts/set_protected_list.sh
-;custom_script_2=modules/custom_scripts/libertas_debug.sh
-
-[base]
-;versioned_fs=1
-;prepopulate_run=1
-versioned_fs=0
-prepopulate_run=0
-make_iso=0
-compress_iso=0
-make_tree_tarball=0
-python_optimize=2
diff --git a/examples/f11-0.88-xo1.5-py-nognome.ini b/examples/f11-0.88-xo1.5-py-nognome.ini
index d803829..68f356e 100644
--- a/examples/f11-0.88-xo1.5-py-nognome.ini
+++ b/examples/f11-0.88-xo1.5-py-nognome.ini
@@ -1,6 +1,7 @@
 ; Dextrose F11-0.88 for the XO-1.5, customized for Paraguay (without GNOME)
 ;
 ; Author: Bernie Innocenti <bernie@codewiz.org>
+; Author: Martin Abente <mabente@paraguayeduca.org>
 
 [global]
 fedora_release=11
@@ -110,103 +111,54 @@ favorites_view_del=
 	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.laptop.AbiWordActivity,
+	org.laptop.Chat,
+	org.laptop.Oficina,
+	org.laptop.RecordActivity,
+	org.laptop.TamTamMini
+	org.laptop.TurtleArtActivity,
+	org.laptop.WebActivity,
+	vu.lux.olpc.Speak,
 
 
 [sugarlabs_activities]
 sugar_version=0.88
 activities=
-	com.jotaro.ImplodeActivity,
 	edu.mit.media.ScratchActivity,
-	org.eq.FotoToon,
 	org.gnome.Labyrinth,
 	org.laptop.AbiWordActivity,
-	org.laptop.AcousticMeasure,
-	org.laptop.Arithmetic,
-	org.laptop.Analyze,
-	org.laptop.Calculate,
 	org.laptop.Chat,
-	org.laptop.Log,
 	org.laptop.ImageViewerActivity,
-	org.laptop.MeasureActivity,
 	org.laptop.Memorize,
 	org.laptop.Oficina,
-	org.laptop.Pippy,
 	org.laptop.RecordActivity,
-	org.laptop.StopWatchActivity,
-	org.laptop.TamTamEdit,
-	org.laptop.TamTamJam,
 	org.laptop.TamTamMini,
-	org.laptop.TamTamSynthLab,
 	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.sugarlabs.AbacusActivity,
-	org.sugarlabs.IRC,
-	org.sugarlabs.InfoSlicer,
 	org.sugarlabs.VisualMatchActivity,
 	org.vpri.EtoysActivity,
 	vu.lux.olpc.Speak,
+	org.worldwideworkshop.PollBuilder,
+	org.worldwideworkshop.olpc.JigsawPuzzle,
 
 ;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,
-;
-;untested on 0.88:
-;	org.worldwideworkshop.PollBuilder,
-;	org.worldwideworkshop.olpc.JigsawPuzzle,
-;	org.worldwideworkshop.olpc.SliderPuzzle,
-;	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-115.xo
 url_51=http://people.sugarlabs.org/~bernie/sugar/activities/gcompris-15.xo
 url_52=http://people.sugarlabs.org/~bernie/sugar/activities/tux_paint-5.xo
 
 [powerd]
-; should work well on the XO-1.5, but disabled just in case
+; should work well on the XO-1.5,
+; but disabled by default because not sufficiently tested
 enable_idle_suspend=0
 
 [buildnr_from_file]