From 6e1fe283d734a6d9e3bcee3923360ac15a73e184 Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@somosazucar.org>
Date: Thu, 14 Nov 2013 10:30:39 +0000
Subject: Try to sync with reference-xo

---
diff --git a/etc/sweets.conf b/etc/sweets.conf
index 1b4e729..b7d46dd 100644
--- a/etc/sweets.conf
+++ b/etc/sweets.conf
@@ -19,15 +19,6 @@ cpsection =
 # hanlde plugins configuration only via configuration files
     plugins
 
-# Sugar Network client configuration
-# http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Implementation#sugar-network-client
-[client]
-# url to connect to Sugar Network server API
-#api-url = http://node.sugarlabs.org
-# space separated list of layers to restrict Sugar Network content by
-# for now, "pilot" layer is being used to QA most useful/stable activities
-layers = pilot
-
 # By default, only stable Sugar Activity implementation will be fetched
 # from the Sugar Network. To stability selection customizable, add exceptions
 # to the following section. Each option shold conform the format:
diff --git a/image/common.ini b/image/common.ini
index 8e86714..167a3c8 100644
--- a/image/common.ini
+++ b/image/common.ini
@@ -3,13 +3,16 @@
 #
 
 [global]
+# Supported locales in a comma separated list.
+# The format of items should be in format of `LANG[_COUNTRY[.CHARSET]]`.
+# If only LANG is set, all supported variations of LANG-COUNTRY will be added.
+# Default CHARSET is UTF8.
+langs=es,es_MX,es_PE,en_US,pt,pt_BR,fr,de,qu,ayc,quz
+
 # Image title.
 # Put your title here.
 customization_info = Hexoquinasa v1.3 BETA5
 
-# Languages to include
-langs=es,en_US,pt,pt_BR,fr,de,qu,ayc,quz
-
 # Image filename.
 # String should contain one formatting argument to make Python expression,
 # `image_name % latestbuild`, valid. Make sure that you escaped `%` symbol
@@ -85,7 +88,7 @@ offline_activities =
     org.laptop.WebActivity,
     org.laptop.Calculate,
     org.laptop.Chat,
-    org.vpri.EtoysActivity,
+#    org.vpri.EtoysActivity,
     org.laptop.ImageViewerActivity,
     org.laptop.sugar.Jukebox,
     org.laptop.sugar.ReadActivity,
@@ -109,7 +112,7 @@ offline_activities =
     org.sugarlabs.SimpleGraph,
     org.laptop.TurtleArtButia,
     vu.lux.olpc.Speak,
-    org.laptop.WikipediaActivity,
+#    org.laptop.WikipediaActivity,
 #org.laptop.WikipediaActivityQU,
     mulawa.Sudoku
 
diff --git a/post.d/rc.sh b/post.d/rc.sh
deleted file mode 100644
index c91fae3..0000000
--- a/post.d/rc.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-grep sweets.d /etc/rc.local >/dev/null || cat >>/etc/rc.local <<EOF
-for i in \$(find /etc/sweets.d -type f -printf "%P\n"); do
-    [ /etc/sweets.d/\$i -nt /\$i ] && cp -a /etc/sweets.d/\$i /\$i
-done
-EOF
-. /etc/rc.local
--
cgit v0.9.1