diff options
| author | Simon Schampijer <simon@schampijer.de> | 2009-02-13 08:40:08 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2009-02-13 08:40:08 (GMT) |
| commit | a02bed342d8094bac3cea65fbd470a293458f02b (patch) | |
| tree | 0e9d32fbf25120c9a5be07953ec54aae9678f301 /config/modulesets/extra-activities.modules | |
| parent | a1c64c75dfd9a39abc5fb5af568beb8ef8af4280 (diff) | |
| parent | 154d847f82aedc8947a086b54bbb3d6cfad747de (diff) | |
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-jhbuild/mainline
Diffstat (limited to 'config/modulesets/extra-activities.modules')
| -rw-r--r-- | config/modulesets/extra-activities.modules | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/config/modulesets/extra-activities.modules b/config/modulesets/extra-activities.modules index d446187..449f38f 100644 --- a/config/modulesets/extra-activities.modules +++ b/config/modulesets/extra-activities.modules @@ -1,6 +1,8 @@ <?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*--> <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?> <moduleset> + <repository type="git" name="git.sugarlabs.org" default="yes" + href="git://git.sugarlabs.org"/> <repository type="git" name="dev.laptop.org" href="git://dev.laptop.org/"/> <repository type="git" name="dev.laptop.org/projects" @@ -31,7 +33,8 @@ <branch repo="dev.laptop.org/projects" /> </bundle> <bundle id="cartoon-builder"> - <branch repo="dev.laptop.org/mamamedia" /> + <branch module="cartoon-builder/mainline.git" + checkoutdir="cartoon-builder"/> </bundle> <bundle id="jigsaw-puzzle"> <branch repo="dev.laptop.org/mamamedia" /> @@ -45,8 +48,8 @@ <bundle id="mamamedia-teacher-center"> <branch repo="dev.laptop.org/mamamedia" /> </bundle> - <bundle id="poll-builder"> - <branch repo="dev.laptop.org/mamamedia" /> + <bundle id="poll"> + <branch module="poll/mainline.git" checkoutdir="poll"/> </bundle> <bundle id="slider-puzzle"> <branch repo="dev.laptop.org/mamamedia" /> @@ -55,7 +58,7 @@ <branch repo="dev.laptop.org/mamamedia" /> </bundle> <bundle id="flipsticks"> - <branch repo="dev.laptop.org/mamamedia" /> + <branch module="flipsticks/mainline.git" checkoutdir="flipsticks"/> </bundle> <bundle id="analyze-activity"> <branch repo="dev.laptop.org/projects" /> @@ -63,4 +66,28 @@ <bundle id="acoustic-measure-activity"> <branch repo="dev.laptop.org/projects" /> </bundle> + <metamodule id="meta-extra-activities"> + <dependencies> + <dep package="block-party-activity"/> + <dep package="penguintv"/> + <dep package="video-chat-activity"/> + <dep package="connect-activity"/> + <dep package="oficina"/> + <dep package="jukebox-activity"/> + <dep package="hellomesh"/> + <dep package="gmail-activity"/> + <dep package="cartoon-builder"/> + <dep package="jigsaw-puzzle"/> + <dep package="joke-machine"/> + <dep package="mamamedia-activity-center"/> + <dep package="mamamedia-teacher-center"/> + <dep package="poll-builder"/> + <dep package="slider-puzzle"/> + <dep package="story-builder"/> + <dep package="flipsticks"/> + <dep package="memorygame"/> + <dep package="analyze-activity"/> + <dep package="acoustic-measure-activity"/> + </dependencies> + </metamodule> </moduleset> |