Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Francis <francis@sugarlabs.org>2012-11-29 18:59:36 (GMT)
committer Daniel Francis <francis@sugarlabs.org>2012-11-29 18:59:36 (GMT)
commitdaeb365d096f9a08b8f82058237dfa4d1c7ddbce (patch)
treeffaa8278bf1f16ec46e006333db620fadf30dcae
parent376e117543ee6d793474ec8735ba592ce188881d (diff)
Add default school activities
Signed-off-by: Daniel Francis <francis@sugarlabs.org>
-rw-r--r--data/Makefile.am11
-rw-r--r--data/activities.defaults12
-rw-r--r--data/schoolactivities.defaults21
3 files changed, 27 insertions, 17 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 6a62d23..90a60c6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,11 +9,12 @@ sugar-100.gtkrc: gtkrc.em
$(top_builddir)/data/sugar-100.gtkrc
sugardir = $(pkgdatadir)/data
-sugar_DATA = \
- activities.defaults \
- kbdconfig \
- mime.defaults \
- GPLv2 \
+sugar_DATA = \
+ activities.defaults \
+ schoolactivities.defaults \
+ kbdconfig \
+ mime.defaults \
+ GPLv2 \
$(GTKRC_FILES)
GTKRC_FILES = \
diff --git a/data/activities.defaults b/data/activities.defaults
index c294b99..812e726 100644
--- a/data/activities.defaults
+++ b/data/activities.defaults
@@ -2,26 +2,14 @@
com.garycmartin.Moon
com.jotaro.ImplodeActivity
-com.laptop.Ruler
-edu.mit.media.ScratchActivity
-org.laptop.AbiWordActivity
-org.laptop.AcousticMeasure
-org.laptop.Analyze
-org.laptop.Calculate
org.laptop.Chat
org.laptop.HelpActivity
org.laptop.MeasureActivity
org.laptop.Memorize
-org.laptop.Oficina
org.laptop.Pippy
org.laptop.RecordActivity
-org.laptop.TamTamEdit
-org.laptop.TamTamJam
-org.laptop.TamTamMini
-org.laptop.TamTamSynthLab
org.laptop.TurtleArtActivity
org.laptop.WebActivity
-org.laptop.WikipediaActivityEN
org.laptop.sugar.ReadActivity
org.vpri.EtoysActivity
vu.lux.olpc.Maze
diff --git a/data/schoolactivities.defaults b/data/schoolactivities.defaults
new file mode 100644
index 0000000..a457774
--- /dev/null
+++ b/data/schoolactivities.defaults
@@ -0,0 +1,21 @@
+# Activities to be automatically added to the ring after an upgrade
+
+com.laptop.Ruler
+edu.mit.media.ScratchActivity
+org.laptop.AbiWordActivity
+org.laptop.AcousticMeasure
+org.laptop.Analyze
+org.laptop.Calculate
+org.laptop.HelpActivity
+org.laptop.MeasureActivity
+org.laptop.Memorize
+org.laptop.Oficina
+org.laptop.TamTamEdit
+org.laptop.TamTamJam
+org.laptop.TamTamMini
+org.laptop.TamTamSynthLab
+org.laptop.TurtleArtActivity
+org.laptop.WebActivity
+org.laptop.WikipediaActivityEN
+org.laptop.sugar.ReadActivity
+org.vpri.EtoysActivity