Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-jhbuild/mainline

14 files changed, 235 insertions, 37 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>
diff --git a/config/modulesets/extra.modules b/config/modulesets/extra.modules
index 377cf7e..4dde9e3 100644
--- a/config/modulesets/extra.modules
+++ b/config/modulesets/extra.modules
@@ -41,5 +41,14 @@
     <dependencies>
     </dependencies>
   </tarball>
+  <metamodule id="meta-extra">
+    <dependencies>
+      <dep package="libjingle"/>
+      <dep package="gst-plugins-farsight"/>
+      <dep package="farsight"/>
+      <dep package="telepathy-stream-engine"/>
+      <dep package="gst-ffmpeg"/>
+    </dependencies>
+  </metamodule>
 </moduleset>
 
diff --git a/config/modulesets/fructose.modules b/config/modulesets/fructose.modules
index 6c12c47..f06b9ad 100644
--- a/config/modulesets/fructose.modules
+++ b/config/modulesets/fructose.modules
@@ -28,7 +28,7 @@
 	  <branch module="terminal/mainline.git" checkoutdir="terminal" />
   </bundle>
   <bundle id="write">
-    <branch module="write/mainline.git" checkoutdir="write" />
+    <branch repo="dev.laptop.org/projects" />
   </bundle>
   <autotools id="etoys">
     <branch repo="dev.laptop.org/projects" />
diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index 4278731..b9363ca 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -6,7 +6,7 @@
   <repository type="svn" name="svn.gnome.org"
       href="http://svn.gnome.org/svn/"/>
   <repository type="svn" name="squeakvm.org"
-        href="http://squeakvm.org/svn/squeak/branches/" trunk-path=""/>
+        href="http://squeakvm.org/svn/squeak/branches/" trunk-template="olpc"/>
   <repository type="git" name="git.imendio.com"
       href="git://git.imendio.com/projects/"/>
   <repository type="svn" name="matchbox.o-hand.com"
@@ -17,6 +17,10 @@
       href="http://dev.laptop.org/pub/sugar/xulrunner/"/>
   <repository type="git" name="dev.laptop.org/users/dsd"
       href="git://dev.laptop.org/users/dsd/"/>
+  <repository type="tarball" name="dbus"
+	  href="http://dbus.freedesktop.org/releases/"/>
+  <repository type="git" name="git.sugarlabs.org" default="yes"
+      href="git://git.sugarlabs.org"/>
   <tarball id="pygobject" version="2.14">
     <source href="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.14/pygobject-2.14.2.tar.bz2"
             md5sum="0e9e9300e81847f4f7266f49d3bebbaf" size="366808"/>
@@ -47,9 +51,9 @@
      <patch file="xulrunner-perms.patch" strip="0"/>
    </patches>
   </autotools>
-  <tarball id="abiword" autogenargs="--enable-libabiword --enable-debug --disable-bonobo --disable-gnomevfs --disable-gnomeui --disable-gucharmap --disable-printing" makefile="GNUmakefile" version="2.6.5">
-    <source href="http://abisource.com/downloads/abiword/2.6.5/source/abiword-2.6.5.tar.gz"
-            size="9514729" md5sum="edce76a1da515dfc102a0e030f722002"/>
+  <tarball id="abiword" autogenargs="--enable-libabiword --enable-debug --disable-bonobo --disable-gnomevfs --disable-gnomeui --disable-gucharmap --disable-printing" makefile="GNUmakefile" version="2.6.6">
+    <source href="http://abisource.com/downloads/abiword/2.6.6/source/abiword-2.6.6.tar.gz"
+            size="9534259" md5sum="b9de84f03f555d4490b63e5b7f53e2f1"/>
     <patches>
       <patch file="libabiword-2.5.2-defaultfont.patch" strip="1"/>
       <patch file="libabiword-2.6.0.svn20071031-draghandles.patch" strip="1"/>
@@ -57,9 +61,9 @@
       <patch file="libabiword-2.6.0.svn20071106-noassertinput.patch" strip="1"/>
     </patches>
   </tarball>
-  <tarball id="abiword-plugins" autogenargs="--enable-libabiword --enable-debug --disable-all --enable-OpenDocument --enable-abicollab --with-abicollab-sugar-backend --enable-abicollab-record-always --enable-loadbindings --with-abiword=../abiword-2.6.5" makefile="GNUmakefile" version="2.6.5">
-    <source href="http://abisource.com/downloads/abiword/2.6.5/source/abiword-plugins-2.6.5.tar.gz"
-            size="1930003" md5sum="6e38e0efc40421591ae4cc0d5202a796"/>
+  <tarball id="abiword-plugins" autogenargs="--enable-libabiword --enable-debug --disable-all --enable-OpenDocument --enable-abicollab --with-abicollab-sugar-backend --enable-abicollab-record-always --enable-loadbindings --with-abiword=../abiword-2.6.6" makefile="GNUmakefile" version="2.6.6">
+    <source href="http://abisource.com/downloads/abiword/2.6.6/source/abiword-plugins-2.6.6.tar.gz"
+            size="1970233" md5sum="45dabc491976e3f21d943817e61b9d89"/>
     <dependencies>
       <dep package="abiword"/>
     </dependencies>
@@ -77,7 +81,7 @@
     </dependencies>
   </autotools>
   <autotools id="hulahop">
-    <branch repo="dev.laptop.org/projects"/>
+    <branch module="hulahop/mainline.git" checkoutdir="hulahop"/>
     <dependencies>
       <dep package="xulrunner"/>
     </dependencies>
@@ -91,14 +95,15 @@
   <autotools id="telepathy-gabble"
              autogen-sh="configure">
     <branch repo="telepathy"
-            version="0.7.16"
-            module="telepathy-gabble/telepathy-gabble-0.7.16.tar.gz"
-            size="1417532" md5sum="8a4be460b5d8233afa170f433ca116cc">
+            version="0.7.20"
+            module="telepathy-gabble/telepathy-gabble-0.7.20.tar.gz"
+            size="1587285" md5sum="0b8b6097de5b3fbd07aaddc96fed70ee">
       <patch file="telepathy-gabble-chmod-unix-socket.patch" strip="1"/>
       <patch file="telepathy-gabble-olpc-no-dbus-uid-check.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="telepathy-glib"/>
+      <dep package="dbus-glib"/>
     </dependencies>
   </autotools>
   <autotools id="telepathy-salut"
@@ -115,9 +120,9 @@
     </dependencies>
   </autotools>
   <autotools id="telepathy-glib" autogen-sh="configure">
-    <branch repo="telepathy" version="0.7.22"
-            module="telepathy-glib/telepathy-glib-0.7.22.tar.gz"
-            size="2250849" md5sum="558d463816ca71955ca27fdcddf715c2" />
+    <branch repo="telepathy" version="0.7.25"
+            module="telepathy-glib/telepathy-glib-0.7.25.tar.gz"
+            size="2326926" md5sum="7a676676e902f0d73ec7ec407fbf04f1" />
   </autotools>
   <distutils id="telepathy-python">
     <branch module="telepathy-python/telepathy-python-0.15.6.tar.gz"
@@ -127,9 +132,17 @@
       <dep package="telepathy-gabble"/>
     </dependencies>
   </distutils>
-  <autotools id="sugar-evince" autogenargs="--disable-static --disable-binary --enable-embed --without-libgnome --disable-scrollkeeper --disable-schemas-install --disable-dvi --without-print --enable-pixbuf --disable-thumbnailer --disable-djvu --disable-comics --disable-nautilus --without-keyring">
-    <branch repo="dev.laptop.org/users/dsd" />
-  </autotools>
+  <tarball id="evince" autogenargs="--disable-static --disable-scrollkeeper --disable-schemas-install --disable-dvi --enable-pixbuf --disable-thumbnailer --disable-djvu --disable-comics --disable-nautilus --without-keyring">
+    <source href="http://download.gnome.org/sources/evince/2.25/evince-2.25.90.tar.bz2"
+            version="2.25.90" size="1790620" md5sum="931b4d5fb4c5a2e4e079a62662b9d224"/>
+  </tarball>
+  <tarball id="gnome-python-desktop">
+    <source href="http://download.gnome.org/sources/gnome-python-desktop/2.25/gnome-python-desktop-2.25.90.tar.bz2"
+            version="2.25.90" size="571621" md5sum="9bc794079fb4dd02f4d0651ff04bbace"/>
+    <dependencies>
+      <dep package="evince"/>
+    </dependencies>
+  </tarball>
   <tarball id="GConf-dbus">
     <source href="http://ftp.gnome.org/pub/gnome/sources/GConf-dbus/2.16/GConf-dbus-2.16.0.tar.bz2"
             version="2.16.0" size="1363876" md5sum="3e7d648f75949b5362af807f5408546b"/>
@@ -137,4 +150,9 @@
       <patch file="gconf-dbus-defaultpath.patch" strip="0"/>
     </patches>
   </tarball>
+  <autotools id="dbus-glib" autogen-sh="configure">
+    <branch repo="dbus" version="0.78"
+	    module="dbus-glib/dbus-glib-0.78.tar.gz"
+	    size="683454" md5sum="d4aa04b9df35b4bd663be38e959941c8" />
+  </autotools>
 </moduleset>
diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index d70b05f..07322d6 100644
--- a/config/modulesets/glucose.modules
+++ b/config/modulesets/glucose.modules
@@ -51,7 +51,7 @@
       <dep package="pyabiword"/>
       <dep package="abiword-plugins"/>
       <dep package="squeak"/>
-      <dep package="sugar-evince"/>
+      <dep package="gnome-python-desktop"/>
       <dep package="hulahop"/>
     </dependencies>
   </metamodule>
diff --git a/config/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch b/config/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch
index bb16883..17988ca 100644
--- a/config/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch
+++ b/config/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch
@@ -1,14 +1,11 @@
-diff -rN -u old-telepathy-gabble-rainbow/src/tube-stream.c new-telepathy-gabble-rainbow/src/tube-stream.c
---- old-telepathy-gabble-rainbow/src/tube-stream.c	2007-12-11 16:28:48.000000000 +0100
-+++ new-telepathy-gabble-rainbow/src/tube-stream.c	2007-12-11 16:28:48.000000000 +0100
-@@ -650,6 +650,9 @@
-               "Error binding socket: %s", g_strerror (errno));
+--- a/src/tube-stream.c
++++ b/src/tube-stream.c
+@@ -667,6 +667,8 @@ tube_stream_open (GabbleTubeStream *self,
+           g_free (path);
            return FALSE;
          }
-+
 +      /* Everyone can use the socket */
-+      chmod (addr.sun_path, 0777);
++      chmod (path, 0777);
+       g_free (path);
      }
    else if (priv->address_type == TP_SOCKET_ADDRESS_TYPE_IPV4)
-     {
-
diff --git a/config/modulesets/sugar.modules b/config/modulesets/sugar.modules
new file mode 100644
index 0000000..cc18300
--- /dev/null
+++ b/config/modulesets/sugar.modules
@@ -0,0 +1,18 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?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"/>
+  <metamodule id="meta-sugar">
+    <dependencies>
+      <dep package="meta-tools"/>
+      <dep package="meta-glucose"/>
+      <dep package="meta-fructose"/> 
+    </dependencies>
+  </metamodule>
+</moduleset>
diff --git a/config/sysdeps/debian-5.0.xml b/config/sysdeps/debian-5.0.xml
new file mode 100644
index 0000000..118a72a
--- /dev/null
+++ b/config/sysdeps/debian-5.0.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<dependencies>
+  <package name="libwnck-dev"/>
+  <package name="python-cairo-dev"/>
+  <package name="automake1.9"/>
+  <package name="libpoppler-glib-dev"/>
+  <package name="libtool"/>
+  <package name="libsqlite3-dev"/>
+  <package name="libnspr4-dev"/>
+  <package name="docbook-xsl"/>
+  <package name="intltool"/>
+  <package name="librsvg2-dev"/>
+  <package name="gtk-doc-tools"/>
+  <package name="libglade2-dev"/>
+  <package name="icon-naming-utils"/>
+  <package name="cdbs"/>
+  <package name="devscripts"/>
+  <package name="quilt"/>
+  <package name="patchutils"/>
+  <package name="python-dev"/>
+  <package name="python-central"/>
+  <package name="debhelper"/>
+  <package name="libglib2.0-dev"/>
+  <package name="python-gtk2-dev"/>
+  <package name="gettext"/>
+  <package name="shared-mime-info"/>
+  <package name="python-empy"/>
+  <package name="libgconf2-dev"/>
+  <package name="libgsf-1-dev"/>
+  <package name="libenchant-dev"/>
+  <package name="libwv-dev"/>
+  <package name="libboost-dev"/>
+  <package name="libgnomevfs2-dev"/>
+  <package name="gcc"/>
+  <package name="g++"/>
+  <package name="libgtk2.0-dev"/>
+  <package name="python-gtk2-dev"/>
+  <package name="libcroco3-dev"/>
+  <package name="libfribidi-dev"/>
+  <package name="libxt-dev"/>
+  <package name="gnome-doc-utils"/>
+  <package name="libexpat1-dev"/>
+  <package name="gettext"/>
+  <package name="zlib1g-dev"/>
+  <package name="gnome-common"/>
+  <package name="python-numpy"/>
+  <package name="xserver-xephyr"/>
+  <package name="make"/>
+  <package name="librsvg2-dev"/>
+  <package name="python-cjson"/>
+  <package name="subversion"/>
+  <package name="libglade2-dev"/>
+  <package name="libidl-dev"/>
+  <package name="libgconf2-dev"/>
+  <package name="gnome-icon-theme"/>
+  <package name="icon-naming-utils"/>
+  <package name="x11-utils"/>
+  <package name="libasound2-dev"/>
+  <package name="python-xapian"/>
+  <package name="libxapian15"/>
+  <package name="python-dbus"/>
+  <package name="libdbus-1-dev"/>
+  <package name="libdbus-glib-1-dev"/>
+  <package name="libloudmouth1-dev"/>
+  <package name="libavahi-gobject-dev"/>
+  <package name="python-avahi"/>
+  <package name="libsoup2.4-dev"/>
+  <package name="libpoppler-glib-dev"/>
+</dependencies>
diff --git a/config/sysdeps/debian-unstable.xml b/config/sysdeps/debian-unstable.xml
index 118a72a..0971c58 100644
--- a/config/sysdeps/debian-unstable.xml
+++ b/config/sysdeps/debian-unstable.xml
@@ -64,6 +64,6 @@
   <package name="libloudmouth1-dev"/>
   <package name="libavahi-gobject-dev"/>
   <package name="python-avahi"/>
-  <package name="libsoup2.4-dev"/>
+  <package name="libsoup2.2-dev"/>
   <package name="libpoppler-glib-dev"/>
 </dependencies>
diff --git a/config/sysdeps/fedora-10.xml b/config/sysdeps/fedora-10.xml
index 9335495..190db8c 100644
--- a/config/sysdeps/fedora-10.xml
+++ b/config/sysdeps/fedora-10.xml
@@ -46,7 +46,7 @@
   <package name="dbus-devel"/>
   <package name="dbus-glib-devel"/>
   <package name="loudmouth-devel"/>
-  <package name="libsoup-devel"/>
+  <package name="libsoup22-devel"/>
   <package name="poppler-glib-devel"/>
 
   <package name="avahi"
diff --git a/config/sysdeps/fedora-rawhide.xml b/config/sysdeps/fedora-rawhide.xml
index 9335495..190db8c 100644
--- a/config/sysdeps/fedora-rawhide.xml
+++ b/config/sysdeps/fedora-rawhide.xml
@@ -46,7 +46,7 @@
   <package name="dbus-devel"/>
   <package name="dbus-glib-devel"/>
   <package name="loudmouth-devel"/>
-  <package name="libsoup-devel"/>
+  <package name="libsoup22-devel"/>
   <package name="poppler-glib-devel"/>
 
   <package name="avahi"
diff --git a/config/sysdeps/olpc-4.xml b/config/sysdeps/olpc-4.xml
index 250113c..5afef5a 100644
--- a/config/sysdeps/olpc-4.xml
+++ b/config/sysdeps/olpc-4.xml
@@ -46,7 +46,7 @@
   <package name="dbus-devel"/>
   <package name="dbus-glib-devel"/>
   <package name="loudmouth-devel"/>
-  <package name="libsoup-devel"/>
+  <package name="libsoup22-devel"/>
 
   <package name="avahi"
            source="avahi"/>
diff --git a/config/sysdeps/ubuntu-8.04.xml b/config/sysdeps/ubuntu-8.04.xml
new file mode 100644
index 0000000..a06f28d
--- /dev/null
+++ b/config/sysdeps/ubuntu-8.04.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<dependencies>
+  <package name="intltool"/>
+  <package name="libtool"/>
+  <package name="python-dev"/>
+  <package name="gcc"/>
+  <package name="g++"/>
+  <package name="libgtk2.0-dev"/>
+  <package name="python-gtk2-dev"/>
+  <package name="python-cairo-dev"/>
+  <package name="libcroco3-dev"/>
+  <package name="libgsf-1-dev"/>
+  <package name="libenchant-dev"/>
+  <package name="libfribidi-dev"/>
+  <package name="libboost-dev"/>
+  <package name="libxt-dev"/>
+  <package name="gnome-doc-utils"/>
+  <package name="libexpat1-dev"/>
+  <package name="gettext"/>
+  <package name="libwv-dev"/>
+  <package name="zlib1g-dev"/>
+  <package name="gnome-common"/>
+  <package name="python-numpy"/>
+  <package name="libwnck-dev"/>
+  <package name="xserver-xephyr"/>
+  <package name="make"/>
+  <package name="librsvg2-dev"/>
+  <package name="python-cjson"/>
+  <package name="automake1.9"/>
+  <package name="subversion"/>
+  <package name="gtk-doc-tools"/>
+  <package name="libglade2-dev"/>
+  <package name="libidl-dev"/>
+  <package name="libgconf2-dev"/>
+  <package name="libgnomevfs2-dev"/>
+  <package name="libpoppler-glib-dev"/>
+  <package name="gnome-icon-theme"/>
+  <package name="icon-naming-utils"/>
+  <package name="x11-utils"/>
+  <package name="icon-slicer"/>
+  <package name="libasound2-dev"/>
+  <package name="python-xapian"/>
+  <package name="libxapian15"/>
+  <package name="python-gtksourceview2"/>
+  <package name="python-gconf"/>
+  <package name="python-dbus"/>
+  <package name="libdbus-1-dev"/>
+  <package name="libdbus-glib-1-dev"/>
+  <package name="libloudmouth1-dev"/>
+  <package name="libavahi-gobject-dev"/>
+  <package name="python-avahi"/>
+  <package name="libpoppler-dev"/>
+  <package name="python-gobject"
+	   source="pygobject"/>
+  <package name="xulrunner-1.9-dev"
+	   source="xulrunner"/>
+  <package name="libsoup2.4-dev"/>
+  <package name="libglib2.0-dev"/>
+  <package name="libpoppler-glib-dev"/>
+</dependencies>
diff --git a/config/sysdeps/ubuntu-8.10.xml b/config/sysdeps/ubuntu-8.10.xml
index a06f28d..c601230 100644
--- a/config/sysdeps/ubuntu-8.10.xml
+++ b/config/sysdeps/ubuntu-8.10.xml
@@ -21,7 +21,7 @@
   <package name="zlib1g-dev"/>
   <package name="gnome-common"/>
   <package name="python-numpy"/>
-  <package name="libwnck-dev"/>
+  <package name="python-gnome2-desktop"/>
   <package name="xserver-xephyr"/>
   <package name="make"/>
   <package name="librsvg2-dev"/>