Disable signing and Paraguayan stuff on international release

1 files changed, 9 insertions, 27 deletions

diff --git a/examples/dextrose-xo1.ini b/examples/dextrose-xo1.ini
index 02ecdc2..a97540f 100644
--- a/examples/dextrose-xo1.ini
+++ b/examples/dextrose-xo1.ini
@@ -8,13 +8,12 @@ olpc_version_major=10
 olpc_version_minor=2
 olpc_version_release=0
 target_platform=XO-1
-langs=en_US,es,es_PY
+langs=en_US,de,de_DE,es,pt,es_PY,es_UY,fr,fr_FR,ne_NP,pt,pt_PT
 modules=
 	base,
 	xo1,
 	jffs2_image,
 	buildnr_from_file,
-	library_homepage,
 	powerd,
 	repos,
 	yumcfg,
@@ -24,11 +23,9 @@ modules=
 	sugar_activities_extra,
 	custom_packages,
 	custom_scripts,
-	gnome,
-	oats_cfg,
-	signing
+	gnome
 
-customization_info=Paraguay
+customization_info=Dextrose International
 
 [repos]
 fedora=fedora,fedora-updates
@@ -66,6 +63,7 @@ del_packages=
 	mlocate,
 	nafees-web-naskh-fonts,
 	nss_ldap,
+	olpc-update,
 	quota,
 	pam_ccreds,
 	pam_passwdqc,
@@ -83,11 +81,12 @@ del_packages=
 	symlinks,
 #	system-config-network-tui,
 #	system-config-firewall-tui,
-	unix2dos
+	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,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/f11-0.88/rpms-freeworld/i386/os
@@ -173,10 +172,7 @@ activities=
 ;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,
+;requires setting the clock:
 ;	tv.alterna.Clock
 
 [sugar_activities_extra]
@@ -192,29 +188,15 @@ url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
 enable_idle_suspend=0
 
 [buildnr_from_file]
-suffix=pyg
-path=oob-buildnr-0.88
-
-[signing]
-bios_crypto_path=/home/bernie/src/olpc/dextrose/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
+suffix=dx
+path=buildnr-dx
 
-[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