Revert "Switch modules to use the sucrose-0.82 branch."

This reverts commit cd5610ebe55d89814c83eef1e6a59e3681a35d7e.

2 files changed, 20 insertions, 13 deletions

diff --git a/config/modulesets/fructose.modules b/config/modulesets/fructose.modules
index 6cd9467..4d40193 100644
--- a/config/modulesets/fructose.modules
+++ b/config/modulesets/fructose.modules
@@ -5,33 +5,40 @@
       href="git://dev.laptop.org/"/>
   <repository type="git" name="dev.laptop.org/projects"
       href="git://dev.laptop.org/projects/" />
+  <bundle id="block-party-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
   <bundle id="web-activity">
-    <branch repo="dev.laptop.org" revision="sucrose-0.82"/>
+    <branch repo="dev.laptop.org" />
   </bundle>
   <bundle id="pippy-activity">
     <branch repo="dev.laptop.org/projects" />
   </bundle>
   <bundle id="chat-activity">
-    <branch repo="dev.laptop.org" revision="sucrose-0.82"/>
+    <branch repo="dev.laptop.org" />
   </bundle>
   <bundle id="read-activity">
-    <branch repo="dev.laptop.org/projects" revision="sucrose-0.82"/>
+    <branch repo="dev.laptop.org/projects" />
   </bundle>
   <bundle id="terminal-activity">
-    <branch repo="dev.laptop.org/projects" revision="sucrose-0.82"/>
+    <branch repo="dev.laptop.org/projects" />
   </bundle>
   <bundle id="write">
-    <branch repo="dev.laptop.org/projects" revision="sucrose-0.82"/>
+    <branch repo="dev.laptop.org/projects" />
   </bundle>
   <autotools id="etoys">
     <branch repo="dev.laptop.org/projects" />
   </autotools>
   <autotools id="calculate">
-    <branch repo="dev.laptop.org/projects" revision="sucrose-0.82"/>
+    <branch repo="dev.laptop.org/projects" />
   </autotools>
   <bundle id="log-activity">
-    <branch repo="dev.laptop.org/projects" revision="sucrose-0.82"/>
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="pippy-activity">
+    <branch repo="dev.laptop.org/projects" />
   </bundle>
+
   <metamodule id="meta-fructose">
     <dependencies>
       <dep package="etoys"/>
diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index dbfa190..35f5d35 100644
--- a/config/modulesets/glucose.modules
+++ b/config/modulesets/glucose.modules
@@ -12,7 +12,7 @@
     </dependencies>
   </autotools>
   <autotools id="sugar-toolkit">
-    <branch repo="dev.laptop.org" revision="sucrose-0.82"/>
+    <branch repo="dev.laptop.org" />
     <dependencies>
       <dep package="pygobject"/>
       <dep package="datastore"/>
@@ -22,7 +22,7 @@
     </dependencies>
   </autotools> 
   <autotools id="sugar">
-    <branch repo="dev.laptop.org" revision="sucrose-0.82"/>
+    <branch/>
     <dependencies>
       <dep package="sugar-base"/>
       <dep package="sugar-toolkit"/>
@@ -31,7 +31,7 @@
     </dependencies>
   </autotools>
   <autotools id="presence-service">
-    <branch repo="dev.laptop.org/projects" revision="sucrose-0.82"/>
+    <branch repo="dev.laptop.org/projects"/>
     <dependencies>
       <dep package="telepathy-gabble"/>
       <dep package="telepathy-salut"/>
@@ -39,19 +39,19 @@
     </dependencies>
   </autotools>
   <autotools id="artwork">
-    <branch repo="dev.laptop.org" revision="sucrose-0.82" />
+    <branch repo="dev.laptop.org" module="artwork"/>
     <dependencies>
     </dependencies>
   </autotools>
   <autotools id="datastore">
-    <branch repo="dev.laptop.org/projects" revision="sucrose-0.82"/>
+    <branch repo="dev.laptop.org/projects"/>
     <dependencies>
       <dep package="xapian-bindings"/>
       <dep package="dbus-python"/>
     </dependencies>
   </autotools>
   <bundle id="journal-activity">
-    <branch repo="dev.laptop.org" revision="sucrose-0.82"/>
+    <branch repo="dev.laptop.org" />
   </bundle>
 
   <metamodule id="meta-glucose">