From daeb365d096f9a08b8f82058237dfa4d1c7ddbce Mon Sep 17 00:00:00 2001
From: Daniel Francis <francis@sugarlabs.org>
Date: Thu, 29 Nov 2012 18:59:36 +0000
Subject: Add default school activities

Signed-off-by: Daniel Francis <francis@sugarlabs.org>
---
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
--
cgit v0.9.1