From 57d2e6ee08c08fe031307c62a6f6ed4e5e418865 Mon Sep 17 00:00:00 2001 From: Sebastian Silva Date: Fri, 19 Apr 2013 02:53:21 +0000 Subject: New stable repo 0.94:SugarNetwork --- diff --git a/deployment.spec b/deployment.spec index ca94243..1e559fa 100644 --- a/deployment.spec +++ b/deployment.spec @@ -10,7 +10,7 @@ Url: http://wiki.sugarlabs.org/go/Harmonic_Distribution/XO_reference_distributio Source: %{name}-%{version}.tar.gz -Requires: sweets-desktop sugar-client sweets-locales sweets +Requires: sweets-desktop sweets-locales sweets PackageKit-presolve BuildArch: noarch %description diff --git a/etc/sugar/blacklist/deployment b/etc/sugar/blacklist/deployment index a28dfa9..e3c18d4 100644 --- a/etc/sugar/blacklist/deployment +++ b/etc/sugar/blacklist/deployment @@ -1,6 +1,6 @@ # Uncomment it to hide "Plugins" Control Panel section to # hanlde plugins configuration only via configuration files -#cpsection plugins +cpsection plugins # No need in ASLO updater with Sugar Network cpsection updater diff --git a/etc/sweets.conf b/etc/sweets.conf index a1dbbcd..96e83c5 100644 --- a/etc/sweets.conf +++ b/etc/sweets.conf @@ -2,7 +2,7 @@ # space separated list of plugins to enable plugins = telepathy proxy sn -[local] +[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 diff --git a/image/common.ini b/image/common.ini index 0fa1403..fbe3ac4 100644 --- a/image/common.ini +++ b/image/common.ini @@ -5,8 +5,7 @@ [global] # Image title. # Put your title here. -customization_info = Hexoquinasa XO distribution -fedora_release = 14 +customization_info = Hexoquinasa v0.9 # Image filename. # String should contain one formatting argument to make Python expression, @@ -47,18 +46,10 @@ path = latestbuild [sweets] # Name of Sweets Distribution repository current one is based on. # http://wiki.sugarlabs.org/go/Template:Sweets_Distribution_Linkbar -# Right now, only "Factory" is accessible. -sweets_repository = Factory -fedora_release = 14 +sweets_repository = 0.94:SugarNetwork # Url to downstream repository. Put your url here. deployment_repository_url = http://download.sugarlabs.org/packages//Hexoquinasa:/1/SweetsDistribution_Factory_Fedora-14/ -# deployment_repository_url = http://download.sugarlabs.org/packages/SweetsDistribution:/Factory:/ReferenceXO/Fedora-%(fedora_release)s/ - -# Sugar Network layer to restrict list of activities and their versions -# Use Contributor Hub application to set what content should be in such layer -# TODO Make sugar that his layer is the same as in etc/sweets.conf -sugar_network_layer = peruvian-pilot # List of bundle_ids (or context GUIDs in Sugar Network terms) of activities # to prefetch to final image to make them accessible in offline right after @@ -69,7 +60,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.Log, @@ -89,16 +80,17 @@ offline_activities = org.laptop.physics, org.laptop.MeasureActivity, org.laptop.VncLauncher, - net.gcompris, - edu.mit.media.ScratchActivity, +#net.gcompris, +#edu.mit.media.ScratchActivity, org.ceibaljam.conozcoamerica, - org.ceibaljam.conozcoalimentos, org.sugarlabs.ICanReadActivity, org.ceibaljam.terronesweeper, org.sugarlabs.SimpleGraph, org.ceibaljam.jamedit, org.laptop.TurtleArtButia, - vu.lux.olpc.Speak + vu.lux.olpc.Speak, + org.ceibaljam.agenda, + org.laptop.WikipediaActivity # List of bundle_ids (or context GUIDs in Sugar Network terms) of activities # make them favorited in Sugar Shell Home view. These activities need @@ -106,6 +98,8 @@ offline_activities = # Put your activities list here. favorite_activities = org.laptop.WebActivity, + org.laptop.WikipediaActivity, + org.laptop.RecordActivity, org.laptop.Calculate, org.laptop.Chat, org.laptop.TurtleArtActivity, diff --git a/image/common_light.ini b/image/common_light.ini index 429a39a..e147177 100644 --- a/image/common_light.ini +++ b/image/common_light.ini @@ -93,13 +93,13 @@ offline_activities = #edu.mit.media.ScratchActivity, org.ceibaljam.conozcoamerica, org.sugarlabs.ICanReadActivity, -# org.ceibaljam.terronesweeper, + org.ceibaljam.terronesweeper, org.sugarlabs.SimpleGraph, org.ceibaljam.jamedit, org.laptop.TurtleArtButia, - vu.lux.olpc.Speak -# org.ceibaljam.agenda, -# org.laptop.WikipediaActivity + vu.lux.olpc.Speak, + org.ceibaljam.agenda, + org.laptop.WikipediaActivity # List of bundle_ids (or context GUIDs in Sugar Network terms) of activities # make them favorited in Sugar Shell Home view. These activities need @@ -107,7 +107,7 @@ offline_activities = # Put your activities list here. favorite_activities = org.laptop.WebActivity, -# org.laptop.WikipediaActivity, + org.laptop.WikipediaActivity, org.laptop.RecordActivity, org.laptop.Calculate, org.laptop.Chat, @@ -124,8 +124,7 @@ add_packages = gstreamer-plugins-ugly, gstreamer-ffmpeg, mplayer, - x11vnc, - synergy + x11vnc [signing] extract=1 diff --git a/image/latestbuild b/image/latestbuild index 176fdeb..8bc6583 100644 --- a/image/latestbuild +++ b/image/latestbuild @@ -1 +1 @@ -119 \ No newline at end of file +120 \ No newline at end of file diff --git a/post.d/gconf.sh b/post.d/gconf.sh index 2e41364..7e5497b 100644 --- a/post.d/gconf.sh +++ b/post.d/gconf.sh @@ -7,4 +7,4 @@ gconf_set --type bool /desktop/sugar/show_logout false gconf_set --type bool /desktop/sugar/power/automatic true gconf_set --type string /desktop/sugar/user/default_nick disabled gconf_set --type bool /desktop/sugar/network/adhoc true -gconf_set --type string /schemas/desktop/sugar/jabber/server 'jabber.somosazucar.org' +gconf_set --type string /desktop/sugar/collaboration/jabber_server 'jabber.somosazucar.org' -- cgit v0.9.1