[Commits] sugar-jhbuild branch master updated.

[Marco Pesenti Gritti]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "/home/olpc-code/git/sugar-jhbuild".

The branch, master has been updated
       via  9a5edc5fa405eff3d9a7868666b612d400b4b72d (commit)
       via  c33d5a9966b805bfaa463ac70d3abb6ce293c6bc (commit)
      from  6676438088f85899606f543e8db3715c5b255bcf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

 config/modulesets/glucose.modules |   30 ++++++++++++++----------------
 config/sysdeps/fedora-10.xml      |    2 ++
 config/sysdeps/fedora-rawhide.xml |    2 ++
 config/sysdeps/olpc-4.xml         |    2 ++
 4 files changed, 20 insertions(+), 16 deletions(-)

- Log -----------------------------------------------------------------
commit 9a5edc5fa405eff3d9a7868666b612d400b4b72d
Author: Marco Pesenti Gritti <marco at marcopg.org>
Date:   Mon Dec 15 13:26:38 2008 +0100

    Missing xulrunner-python dep

diff --git a/config/sysdeps/fedora-10.xml b/config/sysdeps/fedora-10.xml
index 359cae0..5afef5a 100644
--- a/config/sysdeps/fedora-10.xml
+++ b/config/sysdeps/fedora-10.xml
@@ -62,6 +62,8 @@
            source="matchbox-window-manager"/>
   <package name="xulrunner-python-devel"
            source="xulrunner"/>
+  <package name="xulrunner-python"
+           source="xulrunner"/>
   <package name="xulrunner-devel-unstable"
            source="xulrunner"/>
   <package name="hippo-canvas-python"
diff --git a/config/sysdeps/fedora-rawhide.xml b/config/sysdeps/fedora-rawhide.xml
index 359cae0..5afef5a 100644
--- a/config/sysdeps/fedora-rawhide.xml
+++ b/config/sysdeps/fedora-rawhide.xml
@@ -62,6 +62,8 @@
            source="matchbox-window-manager"/>
   <package name="xulrunner-python-devel"
            source="xulrunner"/>
+  <package name="xulrunner-python"
+           source="xulrunner"/>
   <package name="xulrunner-devel-unstable"
            source="xulrunner"/>
   <package name="hippo-canvas-python"
diff --git a/config/sysdeps/olpc-4.xml b/config/sysdeps/olpc-4.xml
index 359cae0..5afef5a 100644
--- a/config/sysdeps/olpc-4.xml
+++ b/config/sysdeps/olpc-4.xml
@@ -62,6 +62,8 @@
            source="matchbox-window-manager"/>
   <package name="xulrunner-python-devel"
            source="xulrunner"/>
+  <package name="xulrunner-python"
+           source="xulrunner"/>
   <package name="xulrunner-devel-unstable"
            source="xulrunner"/>
   <package name="hippo-canvas-python"

commit c33d5a9966b805bfaa463ac70d3abb6ce293c6bc
Author: Marco Pesenti Gritti <marco at marcopg.org>
Date:   Mon Dec 15 12:48:13 2008 +0100

    Switch glucose repos to git.sugarlabs.org.

diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index 7782676..0375087 100644
--- a/config/modulesets/glucose.modules
+++ b/config/modulesets/glucose.modules
@@ -1,50 +1,48 @@
 <?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
-  <repository type="git" name="dev.laptop.org" default="yes"
-      href="git://dev.laptop.org/"/>
-  <repository type="git" name="dev.laptop.org/projects"
-      href="git://dev.laptop.org/projects/"/>
+  <repository type="git" name="git.sugarlabs.org" default="yes"
+      href="git://git.sugarlabs.org"/>
   <autotools id="sugar-base">
-    <branch repo="dev.laptop.org"/>
+    <branch module="sugar-base/mainline.git" checkoutdir="sugar-base"/>
     <dependencies>
       <dep package="pygobject"/>
     </dependencies>
   </autotools>
   <autotools id="sugar-toolkit">
-    <branch repo="dev.laptop.org" />
+    <branch module="sugar-toolkit/mainline.git" checkoutdir="sugar-toolkit"/>
     <dependencies>
       <dep package="pygobject"/>
-      <dep package="datastore"/>
+      <dep package="sugar-datastore"/>
       <dep package="hippo-canvas"/>
-      <dep package="presence-service"/>
+      <dep package="sugar-presence-service"/>
     </dependencies>
   </autotools> 
   <autotools id="sugar">
-    <branch/>
+    <branch module="sugar/mainline.git" checkoutdir="sugar"/>
     <dependencies>
       <dep package="GConf-dbus"/>
       <dep package="sugar-base"/>
       <dep package="sugar-toolkit"/>
-      <dep package="artwork"/>
+      <dep package="sugar-artwork"/>
       <dep package="matchbox-window-manager"/>
     </dependencies>
   </autotools>
-  <autotools id="presence-service">
-    <branch repo="dev.laptop.org/projects"/>
+  <autotools id="sugar-presence-service">
+    <branch module="sugar-presence-service/mainline.git" checkoutdir="sugar-presence-service"/>
     <dependencies>
       <dep package="telepathy-gabble"/>
       <dep package="telepathy-salut"/>
       <dep package="telepathy-python"/>
     </dependencies>
   </autotools>
-  <autotools id="artwork">
-    <branch repo="dev.laptop.org" module="artwork"/>
+  <autotools id="sugar-artwork">
+    <branch module="sugar-artwork/mainline.git" checkoutdir="sugar-artwork"/>
     <dependencies>
     </dependencies>
   </autotools>
-  <autotools id="datastore">
-    <branch repo="dev.laptop.org/projects"/>
+  <autotools id="sugar-datastore">
+    <branch module="sugar-datastore/mainline.git" checkoutdir="sugar-datastore"/>
   </autotools>
 
   <metamodule id="meta-glucose">
-----------------------------------------------------------------------


--
/home/olpc-code/git/sugar-jhbuild