Pull jhbuild instead of using an internal copy.

Directory structure cleanups.

6 files changed, 468 insertions, 0 deletions

diff --git a/config/modulesets/activities.modules b/config/modulesets/activities.modules
new file mode 100644
index 0000000..80eb1ab
--- /dev/null
+++ b/config/modulesets/activities.modules
@@ -0,0 +1,65 @@
+<?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"
+      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="journal-activity">
+    <branch repo="dev.laptop.org" />
+  </bundle>
+  <bundle id="web-activity">
+    <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" />
+  </bundle>
+  <bundle id="memorygame">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="read-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="terminal-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="write">
+    <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" />
+  </autotools>
+  <bundle id="log-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="analyze-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="acoustic-measure-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <metamodule id="meta-sugar-activities">
+    <dependencies>
+      <dep package="etoys"/>
+      <dep package="read-activity"/>
+      <dep package="web-activity"/>
+      <dep package="chat-activity"/>
+      <dep package="write"/>
+      <dep package="journal-activity"/>
+      <dep package="terminal-activity"/>
+      <dep package="calculate"/>
+      <dep package="log-activity"/>
+      <dep package="analyze-activity"/>
+      <dep package="acoustic-measure-activity"/>
+    </dependencies>
+  </metamodule>
+</moduleset>
diff --git a/config/modulesets/extra-activities.modules b/config/modulesets/extra-activities.modules
new file mode 100644
index 0000000..2428a7e
--- /dev/null
+++ b/config/modulesets/extra-activities.modules
@@ -0,0 +1,63 @@
+<?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"
+      href="git://dev.laptop.org/"/>
+  <repository type="git" name="dev.laptop.org/projects"
+      href="git://dev.laptop.org/projects/" />
+  <repository type="git" name="dev.laptop.org/mamamedia"
+      href="git://dev.laptop.org/mamamedia/" />
+  <repository type="svn" name="penguintv.sf.net"
+      href="https://penguintv.svn.sourceforge.net/svnroot/penguintv/" />
+  <bundle id="block-party-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="penguintv">
+    <branch repo="penguintv.sf.net" module="trunk" checkoutdir="penguintv" />
+  </bundle>
+  <bundle id="video-chat-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="connect-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="oficina">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="jukebox-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="hellomesh">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="gmail-activity">
+    <branch repo="dev.laptop.org/projects" />
+  </bundle>
+  <bundle id="cartoon-builder">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="jigsaw-puzzle">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="joke-machine">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="mamamedia-activity-center">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="mamamedia-teacher-center">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="poll-builder">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="slider-puzzle">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="story-builder">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+  <bundle id="flipsticks">
+    <branch repo="dev.laptop.org/mamamedia" />
+  </bundle>
+</moduleset>
diff --git a/config/modulesets/extra.modules b/config/modulesets/extra.modules
new file mode 100644
index 0000000..7e37af3
--- /dev/null
+++ b/config/modulesets/extra.modules
@@ -0,0 +1,45 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <tarball id="libjingle" version="0.3.11">
+    <source href="http://downloads.sourceforge.net/tapioca-voip/libjingle-0.3.11.tar.gz"
+            size="613784" md5sum="f9602b2dbca1e13dfe0b15e9188b4442"/>
+    <dependencies/>
+    <patches>
+      <patch file="libjingle_ignore_invalid_sockets.patch" strip="1"/>
+      <patch file="libjingle_send_assert.patch" strip="1"/>
+      <patch file="libjingle_tcp_wouldblock.patch" strip="1"/>
+    </patches>
+  </tarball>
+  <tarball id="gst-plugins-farsight" version="0.12.7">
+    <source href="http://farsight.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-0.12.7.tar.gz"
+            size="569293" md5sum="1687c061cb0f98fb7e1556d786660b96"/>
+    <dependencies>
+       <dep package="libjingle"/>
+    </dependencies>
+  </tarball>
+  <tarball id="farsight" version="0.1.27">
+    <source href="http://farsight.freedesktop.org/releases/farsight/farsight-0.1.27.tar.gz"
+            size="579978" md5sum="ad261dfdbe1266c2a9c1369537c062cb"/>
+    <dependencies>
+       <dep package="libjingle"/>
+       <dep package="gst-plugins-farsight"/>
+    </dependencies>
+  </tarball>
+  <tarball id="telepathy-stream-engine" version="0.5.2" autogenargs="--disable-seq-dias">
+    <source href="http://telepathy.freedesktop.org/releases/stream-engine/telepathy-stream-engine-0.5.2.tar.gz"
+            size="445546" md5sum="5d77949682739728257c985f90dcfe34"/>
+    <dependencies>
+       <dep package="farsight"/>
+       <dep package="libtelepathy"/>
+       <dep package="gst-ffmpeg"/>
+    </dependencies>
+  </tarball>
+  <tarball id="gst-ffmpeg" version="0.10.3">
+    <source href="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.3.tar.gz"
+            md5sum="985c563c4a4d78b33656f6f30aa2fd9d" size="3097803"/>
+    <dependencies>
+    </dependencies>
+  </tarball>
+</moduleset>
+
diff --git a/config/modulesets/freedesktop.modules b/config/modulesets/freedesktop.modules
new file mode 100644
index 0000000..c081e31
--- /dev/null
+++ b/config/modulesets/freedesktop.modules
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <tarball id="avahi" version="0.6.22"
+           autogenargs="--disable-qt3 --disable-qt4 --disable-mono
+                        --disable-python
+                        --disable-static --enable-shared --enable-expat
+                        --disable-monodoc --disable-autoipd
+                        --disable-doxyxen-doc --disable-manpages
+                        --disable-compat-howl --disable-compat-libdns_sd
+                        --disable-gdbm --disable-libdaemon
+                        --with-distro=none">
+    <source href="http://avahi.org/download/avahi-0.6.22.tar.gz"
+            md5sum="c84b1a8a23126e188426728710414dc8" size="1199901"/>
+    <dependencies>
+      <dep package="dbus"/>
+    </dependencies>
+  </tarball>
+  <tarball id="dbus" version="1.1.0"
+           autogenargs="--disable-selinux --with-system-socket=/var/run/dbus/system_bus_socket">
+    <source href="http://dbus.freedesktop.org/releases/dbus/dbus-1.1.0.tar.gz"
+            md5sum="33da5c29ba1e83c07efeb8be8edae0ef" size="1317322"/>
+    <dependencies>
+    </dependencies>
+  </tarball>
+  <tarball id="dbus-glib" version="0.73">
+    <source href="http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.73.tar.gz"
+            md5sum="4563eeebae66828e30b72e2c1d90a92c" size="644223"/>
+    <dependencies>
+      <dep package="dbus"/>
+    </dependencies>
+  </tarball>
+  <repository href="http://dbus.freedesktop.org/releases/dbus-python/" name="dbus/dbus-python" type="tarball"/>
+  <repository href="http://projects.collabora.co.uk/~smcv/" name="dbus-python-snapshots" type="tarball"/>
+  <autotools autogen-sh="configure" id="dbus-python">
+    <branch module="dbus-python-0.82.3.tar.gz"
+            md5sum="6b7626979b63994613a533a2d244c48c" size="488123"
+            repo="dbus/dbus-python" version="0.82.3"/>
+    <dependencies>
+      <dep package="dbus"/>
+    </dependencies>
+  </autotools>
+</moduleset>
diff --git a/config/modulesets/gnome.modules b/config/modulesets/gnome.modules
new file mode 100644
index 0000000..975742e
--- /dev/null
+++ b/config/modulesets/gnome.modules
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <repository type="svn" name="svn.gnome.org" default="yes"
+      href="http://svn.gnome.org/svn/"/>
+  <autotools id="pygobject">
+    <branch/>
+  </autotools>
+</moduleset>
diff --git a/config/modulesets/platform.modules b/config/modulesets/platform.modules
new file mode 100644
index 0000000..bb753d8
--- /dev/null
+++ b/config/modulesets/platform.modules
@@ -0,0 +1,241 @@
+<?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="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=""/>
+  <repository type="git" name="git.imendio.com"
+      href="git://git.imendio.com/projects/"/>
+  <repository type="svn" name="matchbox.o-hand.com"
+      href="http://svn.o-hand.com/repos/matchbox/"/>
+  <repository type="tarball" name="telepathy"
+      href="http://telepathy.freedesktop.org/releases/"/>
+  <repository type="tarball" name="dev.laptop.org/~smcv"
+      href="http://dev.laptop.org/~smcv/"/>
+  <repository type="tarball" name="dev.laptop.org/~tomeu"
+      href="http://dev.laptop.org/~tomeu/"/>
+  <repository type="git" name="dev.laptop.org/users/rwh"
+      href="git://dev.laptop.org/users/rwh/"/>
+  <include href="freedesktop.modules"/>
+  <include href="gnome.modules"/>
+  <tarball id="poppler" version="0.6.2">
+    <source href="http://poppler.freedesktop.org/poppler-0.6.2.tar.gz"
+            size="1289454" md5sum="9aa3247277f56d4ea8c045626531d19b"/>
+    <dependencies>
+    </dependencies>
+   <patches>
+     <patch file="poppler-build.patch" strip="0"/>
+   </patches>
+  </tarball>
+  <tarball id="libmatchbox" version="1.8" autogenargs="--enable-pango">
+    <source href="http://matchbox-project.org/sources/libmatchbox/1.8/libmatchbox-1.8.tar.bz2"
+            size="303304" md5sum="6bbd6b41f4fd78b7baa6157b303e5ac0"/>
+    <dependencies>
+    </dependencies>
+  </tarball>
+  <autotools id="matchbox-window-manager">
+    <branch repo="matchbox.o-hand.com" module="trunk/matchbox-window-manager"/>
+    <dependencies>
+      <dep package="libmatchbox"/>
+    </dependencies>
+  </autotools>
+  <tarball id="xapian-core" version="1.0.2">
+    <source href="http://oligarchy.co.uk/xapian/1.0.2/xapian-core-1.0.2.tar.gz"
+            size="6530186" md5sum="9e7f0498bba8a6dad9474f20a8bd17c1"/>
+    <dependencies>
+    </dependencies>
+  </tarball>
+  <tarball id="xapian-bindings" version="1.0.2" autogenargs="--with-python=yes --with-php=no --with-ruby=no --with-tcl=no --with-csharp=no --with-java=no">
+    <source href="http://oligarchy.co.uk/xapian/1.0.2/xapian-bindings-1.0.2.tar.gz"
+            size="984769" md5sum="98d335ded1a509d24646df82ee1ad463"/>
+    <dependencies>
+        <dep package="xapian-core"/>
+    </dependencies>
+  </tarball>
+  <tarball id="xulrunner" autogenargs="--disable-accessibility --with-pthreads --disable-strip --disable-tests --disable-debug --disable-installer --enable-optimize --enable-xinerama --enable-default-toolkit=cairo-gtk2 --disable-xprint --enable-pango --enable-svg --enable-canvas --enable-application=xulrunner --disable-javaxpcom --disable-gnomeui --disable-gnomevfs --disable-airbag --enable-extensions=default,cookie,python/xpcom --disable-crashreporter" version="1.9b5">
+    <source href="http://dev.laptop.org/pub/sugar/xulrunner/xulrunner-1.9b5.tar.bz2"
+            size="36621701" md5sum="c2a2fc058f73d8b726dff213a17fe785"/>
+    <dependencies>
+    </dependencies>
+   <patches>
+     <patch file="xulrunner-build.patch" strip="0"/>
+     <patch file="xulrunner-skip-gre-registration.patch" strip="0"/>
+     <patch file="xulrunner-xds.patch" strip="0"/>
+     <patch file="xulrunner-no-native-theme.patch" strip="0"/>
+     <patch file="xulrunner-perms.patch" strip="0"/>
+   </patches>
+  </tarball>
+  <tarball id="libabiword" autogenargs="--enable-libabiword --enable-debug --disable-bonobo --disable-gnomevfs --disable-gnomeui --disable-gucharmap --disable-printing" makefile="GNUmakefile" version="2.6.0.svn20071127">
+    <source href="http://sugar.abisource.com/libabiword-2.6.0.svn20071127.tar.gz"
+            size="10270720" md5sum="5bac2868be2e2c183be8d0954a123ffe"/>
+    <patches>
+      <patch file="libabiword-2.5.2-defaultfont.patch" strip="1"/>
+      <patch file="libabiword-2.6.0.svn20071031-draghandles.patch" strip="1"/>
+      <patch file="libabiword-2.6.0.svn20071031-nohtmloptions.patch" strip="1"/>
+      <patch file="libabiword-2.6.0.svn20071106-noassertinput.patch" strip="1"/>
+      <patch file="libabiword-docreplace-r22844.patch" strip="1"/>
+    </patches>
+  </tarball>
+  <tarball id="libabiword-plugins" autogenargs="--enable-libabiword --enable-debug --disable-all --enable-OpenDocument --enable-abicollab --with-abicollab-sugar-backend --enable-abicollab-record-always --enable-loadbindings --with-abiword=../libabiword-2.6.0.svn20071127" makefile="GNUmakefile" version="2.6.0.svn20071127">
+    <source href="http://sugar.abisource.com/libabiword-plugins-2.6.0.svn20071127.tar.gz"
+            size="2785280" md5sum="559ac91b58bf1f16a7091013608ab357"/>
+    <dependencies>
+      <dep package="libabiword"/>
+    </dependencies>
+    <patches>
+      <patch file="libabiword-plugins-odt-mimetype-fix-r22396.diff" strip="1"/>
+    </patches>
+  </tarball>
+  <tarball id="pyabiword" version="0.6.0.svn20071127">
+    <source href="http://sugar.abisource.com/pyabiword-0.6.0.svn20071127.tar.gz"
+            size="716800" md5sum="591c60789f38d66812d7d0f9d6842c4c"/>
+    <dependencies>
+      <dep package="libabiword"/>
+    </dependencies>
+  </tarball>
+  <autotools id="squeak">
+    <branch repo="squeakvm.org" module="olpc" checkoutdir="squeak"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+  <autotools id="hulahop">
+    <branch repo="dev.laptop.org/projects"/>
+    <dependencies>
+      <dep package="xulrunner"/>
+    </dependencies>
+  </autotools>
+  <autotools id="hippo-canvas">
+    <branch repo="svn.gnome.org"/>
+    <dependencies>
+      <dep package="pygobject"/>
+    </dependencies>
+  </autotools>
+  <autotools id="sugar-base">
+    <branch repo="dev.laptop.org"/>
+    <dependencies>
+      <dep package="pygobject"/>
+    </dependencies>
+  </autotools>
+  <autotools id="sugar-toolkit">
+    <branch repo="dev.laptop.org" />
+    <dependencies>
+      <dep package="pygobject"/>
+      <dep package="datastore"/>
+      <dep package="hippo-canvas"/>
+      <dep package="presence-service"/>
+      <dep package="dbus-python"/>
+    </dependencies>
+  </autotools> 
+  <autotools id="sugar">
+    <branch/>
+    <dependencies>
+      <dep package="sugar-base"/>
+      <dep package="sugar-toolkit"/>
+      <dep package="artwork"/>
+      <dep package="matchbox-window-manager"/>
+    </dependencies>
+  </autotools>
+  <autotools id="presence-service">
+    <branch repo="dev.laptop.org/projects"/>
+    <dependencies>
+      <dep package="telepathy-gabble"/>
+      <dep package="telepathy-salut"/>
+      <dep package="telepathy-python"/>
+    </dependencies>
+  </autotools>
+  <tarball id="loudmouth" version="1.3.4">
+    <source href="http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.3.4.tar.bz2"
+            size="377910" md5sum="da5d7b788afbde39e2e06e5cb1194ff3"/>
+    <dependencies>
+    </dependencies>
+  </tarball>
+  <autotools id="telepathy-gabble"
+             autogen-sh="configure" autogenargs="--enable-olpc">
+    <branch repo="telepathy"
+            version="0.7.2"
+            module="telepathy-gabble/telepathy-gabble-0.7.2.tar.gz"
+            size="777156" md5sum="8a54160c9b081dbe2751abca89580619">
+      <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="loudmouth"/>
+      <dep package="telepathy-glib"/>
+      <dep package="dbus"/>
+    </dependencies>
+  </autotools>
+  <autotools id="telepathy-salut"
+             autogen-sh="configure" autogenargs="--enable-olpc">
+    <branch repo="telepathy"
+            version="0.3.2"
+            module="telepathy-salut/telepathy-salut-0.3.2.tar.gz"
+            size="722810" md5sum="3e24eaa4a16709397505d9db2dfa4bf6">
+       <patch file="telepathy-salut-chmod-unix-socket.patch" strip="1"/>
+       <patch file="telepathy-salut-olpc-no-dbus-uid-check.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="telepathy-glib"/>
+      <dep package="avahi"/>
+      <dep package="dbus"/>
+    </dependencies>
+  </autotools>
+  <autotools id="telepathy-glib" autogen-sh="configure">
+    <branch repo="telepathy" version="0.7.6"
+            module="telepathy-glib/telepathy-glib-0.7.6.tar.gz"
+            size="1365653" md5sum="64fdaf1dcbb5ca7f5ad6ac275a396285" />
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+  <distutils id="telepathy-python">
+    <branch module="telepathy-python/telepathy-python-0.15.0.tar.gz"
+            repo="telepathy" version="0.15.0"
+            size="84193" md5sum="678a28e3b7d06f75940beec28130d9a5"/>
+    <dependencies>
+      <dep package="dbus-python"/>
+      <dep package="telepathy-gabble"/>
+    </dependencies>
+  </distutils>
+  <autotools id="artwork">
+    <branch repo="dev.laptop.org" module="artwork"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+  <autotools id="datastore">
+    <branch repo="dev.laptop.org/projects"/>
+    <dependencies>
+      <dep package="xapian-bindings"/>
+      <dep package="dbus-python"/>
+    </dependencies>
+  </autotools>
+  <autotools id="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">
+    <branch repo="dev.laptop.org/users/rwh" />
+    <dependencies>
+        <dep package="poppler"/>
+    </dependencies>
+  </autotools> 
+  <tarball id="libtelepathy" version="0.0.54">
+    <source href="http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-0.0.54.tar.gz"
+            size="401942" md5sum="42d3388ea417ccd0e0ae125d185322a8"/>
+    <dependencies>
+       <dep package="dbus"/>
+       <dep package="dbus-glib"/>
+    </dependencies>
+  </tarball>
+  <metamodule id="meta-sugar-platform">
+    <dependencies>
+      <dep package="sugar"/>
+      <dep package="pyabiword"/>
+      <dep package="libabiword-plugins"/>
+      <dep package="squeak"/>
+      <dep package="evince"/>
+      <dep package="hulahop"/>
+    </dependencies>
+  </metamodule>
+</moduleset>