Merged dextrose3-common and dextrose3-xo1-common

1 files changed, 137 insertions, 34 deletions

diff --git a/examples/dextrose4-xo1.ini b/examples/dextrose4-xo1.ini
index aab9cb0..5865329 100644
--- a/examples/dextrose4-xo1.ini
+++ b/examples/dextrose4-xo1.ini
@@ -1,3 +1,4 @@
+; Dextrose4 F18 Sugar 0.97.7
 [global]
 fedora_release=18
 fedora_arch=i386
@@ -5,15 +6,10 @@ olpc_version_major=13
 olpc_version_minor=1
 olpc_version_release=0
 target_platform=XO-1
-langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN,de,hy
+langs=en_US,en_AU,en_GB,hi_IN,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN
 customization_info=Dextrose 4 International
 image_name=dx4g%%03d
 
-[base]
-
-[xo1]
-
-[jffs2_image]
 
 [repos]
 fedora=fedora,fedora-updates,fedora-updates-testing
@@ -28,35 +24,15 @@ addrepo_2=1,olpc-f18-xo1,http://rpmdropbox.laptop.org/f18-xo1/
 addrepo_3=1,dextrose,http://download.sugarlabs.org/dextrose/daily/v4
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
-[x11]
-
-[gnome]
-
-[sugar]
-favorites_view_add=
-	tv.alterna.Clock,
-	org.eq.FotoToon,
-	org.sugarlabs.AbacusActivity,
-	org.sugarlabs.PortfolioActivity,
-	org.sugarlabs.SimpleGraph
-favorites_view_del=
-	org.laptop.sugar.ReadActivity,
-	org.laptop.TamTamSynthLab
-protected_activities=
-	org.laptop.WebActivity,
-	org.laptop.Terminal,
-	org.laptop.Log,
-	org.laptop.AbiWordActivity,
-	org.laptop.sugar.ReadActivity,
-	org.laptop.ImageViewerActivity,
-	org.laptop.RecordActivity
-
-[sugar_activity_group]
-url=http://wiki.laptop.org/go/Activities/G1G1Lite
+[base]
+versioned_fs=0
+prepopulate_run=0
+make_iso=0
+compress_iso=0
+make_tree_tarball=1
+python_optimize=2
 
-; still too many open blockers for XO-1 idle suspend to work well
-[powerd]
-enable_idle_suspend=0
+[bootanim]
 
 [buildnr_from_file]
 path=latestbuild
@@ -118,3 +94,130 @@ add_packages=
 ; uy#1792: needed to register "Documents" (and other special) folders.
         xdg-user-dirs,
 
+[custom_scripts]
+custom_script_1=%(oob_config_dir)s/disable_mesh.sh
+custom_script_2=%(oob_config_dir)s/sugar-client-conf.sh
+
+[xo1]
+
+[gnome]
+
+[jffs2_image]
+
+; still too many open blockers for XO-1 idle suspend to work well
+[powerd]
+enable_idle_suspend=0
+
+[sd_card_image]
+; 4GB image
+size_1=3865470566
+; 2GB image
+;size_2=1932735283,2gb
+keep_disk_image=1
+compress_disk_image=1
+make_zd=0
+
+
+[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,
+protected_activities=
+	org.laptop.AbiWordActivity,
+	org.laptop.Oficina,
+	org.laptop.WebActivity,
+	org.laptop.sugar.ReadActivity,
+	org.laptop.RecordActivity,
+	edu.mit.media.ScratchActivity,
+	org.laptop.TurtleArtActivity,
+	org.vpri.EtoysActivityt,
+	net.gcompris,
+	org.tuxpaint,
+	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,
+	com.socialtext.SocialCalcActivity,
+	org.vpri.EtoysActivity,
+
+[sugar_activity_group]
+url=http://wiki.laptop.org/go/Activities/G1G1Lite
+install_activities=0
+
+
+[sugarlabs_activities]
+sugar_version=0.90
+activities=
+	com.jotaro.ImplodeActivity,
+; has been removed from activities.sugarlabs.org (not Open Source)
+;	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,
+	org.laptop.RecordActivity,
+	org.laptop.TamTamMini,
+	org.laptop.Terminal,
+	org.laptop.TurtleArtActivity,
+	org.laptop.WebActivity,
+	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,
+	vu.lux.olpc.Maze,
+	vu.lux.olpc.Speak,
+
+; wasn't downloadable on 2011-03-16
+;	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,
+
+; AC "priority" activities
+	org.laptop.Pippy,
+	org.laptop.AcousticMeasure,
+	org.laptop.Calculate,
+	org.laptop.StopWatchActivity,
+	org.sugarlabs.IRC,
+
+
+
+
+
+[x11]
+
+[xo1]
+
+
+