Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2011-06-15 13:07:17 (GMT)
committer Daniel Drake <dsd@laptop.org>2011-06-15 13:07:17 (GMT)
commitaa30fd5f3dafb8b3d7d40c0d80346230dd02cb3f (patch)
tree9db4d4fe5875fc2ff0d8fcdaafb7dce1f5a4d7b4
parent440ced3136aa5f02ddcdafbb30ec5c51b7a01ffb (diff)
F14 configs: Remove Colors (#10696)
Also synchronize protected_activities settings between stable and development builds.
-rw-r--r--examples/f14-xo1.5.ini10
-rw-r--r--examples/f14-xo1.ini8
-rw-r--r--examples/olpc-os-11.2.0-xo1.5.ini1
3 files changed, 16 insertions, 3 deletions
diff --git a/examples/f14-xo1.5.ini b/examples/f14-xo1.5.ini
index 7078eb8..13dd052 100644
--- a/examples/f14-xo1.5.ini
+++ b/examples/f14-xo1.5.ini
@@ -48,10 +48,17 @@ favorites_view_add=
org.laptop.sugar.GetBooksActivity,
org.laptop.WikipediaActivity,
org.laptop.WikipediaActivityEN,
- org.laptop.community.Colors,
org.laptop.StopWatchActivity,
org.laptop.RecordActivity,
org.laptop.community.Finance
+protected_activities=
+ org.laptop.WebActivity,
+ org.laptop.Terminal,
+ org.laptop.Log,
+ org.laptop.AbiWordActivity,
+ org.laptop.sugar.ReadActivity,
+ org.laptop.ImageViewerActivity,
+ org.laptop.RecordActivity
[sugarlabs_activities]
sugar_version=0.90
@@ -74,7 +81,6 @@ activities=org.laptop.HelpActivity,
org.laptop.sugar.Jukebox,
org.gnome.Labyrinth,
org.laptop.ImageViewerActivity,
- org.laptop.community.Colors,
org.laptop.community.Finance,
org.laptop.AcousticMeasure,
org.laptop.WebActivity,
diff --git a/examples/f14-xo1.ini b/examples/f14-xo1.ini
index cecebab..8e15d91 100644
--- a/examples/f14-xo1.ini
+++ b/examples/f14-xo1.ini
@@ -32,6 +32,14 @@ add_excludes_to=fedora,fedora-updates,fedora-updates-testing
[sugar]
favorites_view_add=org.laptop.sugar.Jukebox
+protected_activities=
+ org.laptop.WebActivity,
+ org.laptop.Terminal,
+ org.laptop.Log,
+ org.laptop.AbiWordActivity,
+ org.laptop.sugar.ReadActivity,
+ org.laptop.ImageViewerActivity,
+ org.laptop.RecordActivity
[sugarlabs_activities]
sugar_version=0.90
diff --git a/examples/olpc-os-11.2.0-xo1.5.ini b/examples/olpc-os-11.2.0-xo1.5.ini
index a9d6638..2553b03 100644
--- a/examples/olpc-os-11.2.0-xo1.5.ini
+++ b/examples/olpc-os-11.2.0-xo1.5.ini
@@ -48,7 +48,6 @@ favorites_view_add=
org.laptop.sugar.GetBooksActivity,
org.laptop.WikipediaActivity,
org.laptop.WikipediaActivityEN,
- org.laptop.community.Colors,
org.laptop.StopWatchActivity,
org.laptop.RecordActivity,
org.laptop.community.Finance