From 036da89dd3a75636434a25cc075655445cd2bbfd Mon Sep 17 00:00:00 2001
From: Bernie Innocenti <bernie@codewiz.org>
Date: Sat, 23 May 2009 16:05:12 +0000
Subject: Fixups for streamlined build

These are a few required changes that were missing in the
previous patch.
---
diff --git a/config/modulesets/etoys.modules b/config/modulesets/etoys.modules
index 0ef37b9..faf9ec3 100644
--- a/config/modulesets/etoys.modules
+++ b/config/modulesets/etoys.modules
@@ -3,6 +3,8 @@
 <moduleset>
   <repository type="svn" name="squeakvm.org"
 	href="http://squeakvm.org/svn/squeak/branches/" trunk-template="olpc"/>
+  <repository type="git" name="dev.laptop.org/projects"
+        href="git://dev.laptop.org/projects/" />
 
   <autotools id="squeak">
     <branch repo="squeakvm.org" module="olpc" checkoutdir="squeak"/>
diff --git a/config/modulesets/fructose.modules b/config/modulesets/fructose.modules
index 73a14e4..e163b76 100644
--- a/config/modulesets/fructose.modules
+++ b/config/modulesets/fructose.modules
@@ -51,7 +51,6 @@
 
   <metamodule id="meta-fructose">
     <dependencies>
-      <dep package="etoys"/>
       <dep package="read"/>
       <dep package="browse"/>
       <dep package="chat"/>
diff --git a/config/modulesets/sugar.modules b/config/modulesets/sugar.modules
index a4bfb91..1fb0744 100644
--- a/config/modulesets/sugar.modules
+++ b/config/modulesets/sugar.modules
@@ -2,12 +2,12 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
 
-  <include href="tools.modules"/>
   <include href="glucose-external.modules"/>
   <include href="glucose.modules"/>
   <include href="fructose.modules"/>
   <include href="extra.modules"/>
   <include href="extra-activities.modules"/>
+  <include href="etoys.modules"/>
   <include href="buildbot.modules"/>
   <metamodule id="meta-sugar">
     <dependencies>
--
cgit v0.9.1