From 4c41576c95648cc5741cabc3acb5d9f0bb8b11fc Mon Sep 17 00:00:00 2001
From: Simon Poirier <simpoir@Eridani.(none)>
Date: Fri, 18 Sep 2009 15:49:43 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:tutorius/mainline

Conflicts:
	setup.py
	toolkitfix/__init__.py
---
(limited to 'jhbuild/config/modulesets/glucose-tutorius.modules')

diff --git a/jhbuild/config/modulesets/glucose-tutorius.modules b/jhbuild/config/modulesets/glucose-tutorius.modules
deleted file mode 100644
index 346581a..0000000
--- a/jhbuild/config/modulesets/glucose-tutorius.modules
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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"/>
-  <autotools id="sugar-base">
-    <branch module="sugar-base/mainline.git" checkoutdir="sugar-base"/>
-    <dependencies>
-      <dep package="pygobject"/>
-    </dependencies>
-  </autotools>
-  <autotools id="sugar-toolkit">
-    <branch module="sugar-toolkit/sugar-toolkit-tutorius.git" checkoutdir="sugar-toolkit"/>
-    <dependencies>
-      <dep package="pygobject"/>
-      <dep package="sugar-datastore"/>
-      <dep package="hippo-canvas"/>
-      <dep package="sugar-presence-service"/>
-    </dependencies>
-  </autotools>
-  <distutils id="tutorius">
-    <branch module="tutorius/mainline.git" checkoutdir="tutorius"/>
-    <dependencies>
-      <dep package="sugar-toolkit"/>
-    </dependencies>
-  </distutils>
-  <autotools id="sugar">
-    <branch module="sugar/mainline.git" checkoutdir="sugar"/>
-    <dependencies>
-      <dep package="GConf-dbus"/>
-      <dep package="sugar-base"/>
-      <dep package="sugar-toolkit"/>
-      <dep package="sugar-artwork"/>
-      <dep package="metacity"/>
-    </dependencies>
-  </autotools>
-  <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="sugar-artwork">
-    <branch module="sugar-artwork/mainline.git" checkoutdir="sugar-artwork"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-  <autotools id="sugar-datastore">
-    <branch module="sugar-datastore/mainline.git" checkoutdir="sugar-datastore"/>
-  </autotools>
-
-  <metamodule id="meta-glucose">
-    <dependencies>
-      <dep package="sugar"/>
-      <dep package="pyabiword"/>
-      <dep package="abiword-plugins"/>
-      <dep package="squeak"/>
-      <dep package="gnome-python-desktop"/>
-      <dep package="hulahop"/>
-    </dependencies>
-  </metamodule>
-</moduleset>
--
cgit v0.9.1