diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-05-22 10:29:03 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-05-22 10:29:03 (GMT) |
commit | a742ce634d9d1a9bf5f02925097c6c9cf1bf8ccd (patch) | |
tree | 5ae1037489056582886a526e66ba668ccd326fc1 | |
parent | 55f631200df237a4a31e23b0d78304a183ed64a9 (diff) |
Make fructose/glucose modules match roadmap.
-rw-r--r-- | config/modulesets/extra-activities.modules | 9 | ||||
-rw-r--r-- | config/modulesets/fructose.modules | 16 | ||||
-rw-r--r-- | config/modulesets/glucose.modules | 5 |
3 files changed, 19 insertions, 11 deletions
diff --git a/config/modulesets/extra-activities.modules b/config/modulesets/extra-activities.modules index 2428a7e..61c5918 100644 --- a/config/modulesets/extra-activities.modules +++ b/config/modulesets/extra-activities.modules @@ -60,4 +60,13 @@ <bundle id="flipsticks"> <branch repo="dev.laptop.org/mamamedia" /> </bundle> + <bundle id="memorygame"> + <branch repo="dev.laptop.org/projects" /> + </bundle> + <bundle id="analyze-activity"> + <branch repo="dev.laptop.org/projects" /> + </bundle> + <bundle id="acoustic-measure-activity"> + <branch repo="dev.laptop.org/projects" /> + </bundle> </moduleset> diff --git a/config/modulesets/fructose.modules b/config/modulesets/fructose.modules index 4c967d0..2daf678 100644 --- a/config/modulesets/fructose.modules +++ b/config/modulesets/fructose.modules @@ -8,9 +8,6 @@ <bundle id="block-party-activity"> <branch repo="dev.laptop.org/projects" /> </bundle> - <bundle id="journal-activity"> - <branch repo="dev.laptop.org" /> - </bundle> <bundle id="web-activity"> <branch repo="dev.laptop.org" /> </bundle> @@ -20,9 +17,6 @@ <bundle id="chat-activity"> <branch repo="dev.laptop.org" /> </bundle> - <bundle id="memorygame"> - <branch repo="dev.laptop.org/projects" /> - </bundle> <bundle id="read-activity"> <branch repo="dev.laptop.org/projects" /> </bundle> @@ -41,12 +35,13 @@ <bundle id="log-activity"> <branch repo="dev.laptop.org/projects" /> </bundle> - <bundle id="analyze-activity"> + <bundle id="tamtam"> <branch repo="dev.laptop.org/projects" /> </bundle> - <bundle id="acoustic-measure-activity"> + <bundle id="pippy-activity"> <branch repo="dev.laptop.org/projects" /> </bundle> + <metamodule id="meta-fructose"> <dependencies> <dep package="etoys"/> @@ -54,12 +49,11 @@ <dep package="web-activity"/> <dep package="chat-activity"/> <dep package="write"/> - <dep package="journal-activity"/> <dep package="terminal-activity"/> <dep package="calculate"/> <dep package="log-activity"/> - <dep package="analyze-activity"/> - <dep package="acoustic-measure-activity"/> + <dep package="tamtam"/> + <dep package="pippy-activity"/> </dependencies> </metamodule> </moduleset> diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules index 88a8d88..ae0c83e 100644 --- a/config/modulesets/glucose.modules +++ b/config/modulesets/glucose.modules @@ -51,6 +51,10 @@ <dep package="dbus-python"/> </dependencies> </autotools> + <bundle id="journal-activity"> + <branch repo="dev.laptop.org" /> + </bundle> + <metamodule id="meta-glucose"> <dependencies> <dep package="sugar"/> @@ -59,6 +63,7 @@ <dep package="squeak"/> <dep package="evince"/> <dep package="hulahop"/> + <dep package="journal-activity"/> </dependencies> </metamodule> </moduleset> |