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

5 files changed, 58 insertions, 17 deletions

diff --git a/config/modulesets/buildbot.modules b/config/modulesets/buildbot.modules
index 5b50407..645c3af 100644
--- a/config/modulesets/buildbot.modules
+++ b/config/modulesets/buildbot.modules
@@ -5,30 +5,35 @@
       href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="twistedmatrix.com"
       href="http://tmrc.mit.edu/mirror/twisted/"/>
-  <repository type="tarball" name="zope.org"
-      href="http://www.zope.org/Products/"/>
+  <repository type="tarball" name="pypi" href="http://pypi.python.org/packages/source/" />
+
+  <distutils id="distribute">
+    <branch repo="pypi" module="d/distribute/distribute-0.6.10.tar.gz" version="0.6.10"
+            size="385641" hash="sha512:992ed3ac16e357ef351bc0d2edacb5cfb9369ae9fbf0a1c72c914ec00a32fc0cfd09a6f3534e2e918e889c60ff67386943bc13cc862fec8241a6b3bc9c3e48c4" />
+  </distutils>
 
   <distutils id="zope-interface">
-    <branch repo="zope.org"
-            module="ZopeInterface/3.3.0/zope.interface-3.3.0.tar.gz" version="3.3.0"
-            size="104204" md5sum="93668855e37b4691c5c956665c33392c" />
+    <branch repo="pypi" module="z/zope.interface/zope.interface-3.5.3.tar.gz" version="3.5.3"
+            size="115571" hash="sha512:d34e150b48eb68a52c533bfa63c215a718e0971d9cf83bc0a9232363af63e7be632ef970653bd62065b185896b9fb0f91f26344437856df65753027d1307f94d" />
+    <dependencies>
+      <dep package="distribute"/>
+    </dependencies>
   </distutils>
 
   <distutils id="twisted">
-    <branch repo="twistedmatrix.com"
-            module="Twisted/8.1/Twisted-8.1.0.tar.bz2" version="8.1.0"
-            size="2371422" md5sum="a575f29ead4cc02c54e9061d0e6ac7c3" />
+    <branch repo="twistedmatrix.com" module="Twisted/10.0/Twisted-10.0.0.tar.bz2" version="10.0.0"
+            size="2583372" hash="sha512:dc57690e8f67e13f372af61d4933882876ae5d7b1e76dda4037746b910ef6cbe3f9ab99d672372362c5a6c44d86ec84c84ee1e53d05c90f1676e4b83078d6783" />
     <dependencies>
       <dep package="zope-interface"/>
     </dependencies>
   </distutils>
 
   <distutils id="buildbot">
-    <branch repo="sourceforge.net"
-            module="buildbot/buildbot-0.7.11p3.tar.gz" version="0.7.11p3"
-            size="1019706" md5sum="6e4ef001d11caf270e2ed7d1d7d43318" />
+    <branch repo="sourceforge.net" module="buildbot/buildbot-0.7.12.tar.gz" version="0.7.12"
+            size="1296550" hash="sha512:782341a9591f5b6f69d1bf58a1e66e0363afa2268fe6049ae2015ed213335bec53126008f7930132e57caa09af582c923e2828d4a17f03573d0b13a94f97b7ce" />
     <dependencies>
       <dep package="twisted"/>
+      <dep package="distribute"/>
     </dependencies>
   </distutils>
 
diff --git a/config/sysdeps/50ubuntu-10.04.xml b/config/sysdeps/50ubuntu-10.04.xml
new file mode 100644
index 0000000..a7cecbf
--- /dev/null
+++ b/config/sysdeps/50ubuntu-10.04.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<dependencies>
+  <package name="espeak"/>
+  <package name="espeak-data"/>
+  <package name="libtelepathy-glib0" source="telepathy-glib"/>
+  <package name="libdbus-glib-1-dev" source="dbus-glib"/>
+  <package name="libxklavier-dev" source="libxklavier"/>
+  <package name="metacity" source="metacity"/>
+  <package name="pep8" source="pep8"/>
+  <package name="pylint" source="pylint"/>
+  <package name="python-evince" source="gnome-python-desktop"/>
+<!--  <package name="python-metacity" source="gnome-python-desktop"/> -->
+  <package name="python-rsvg" source="gnome-python-desktop"/>
+  <package name="python-telepathy" source="telepathy-python"/>
+  <package name="python-wnck" source="gnome-python-desktop"/>
+  <package name="telepathy-gabble" source="telepathy-gabble"/>
+  <package name="telepathy-salut" source="telepathy-salut"/>
+  <package name="xulrunner-1.9.1-dev" source="xulrunner"/><!-- for hulahop -->
+</dependencies>
diff --git a/sbuildbot/master.cfg b/sbuildbot/master.cfg
index 30699b4..6d90b45 100644
--- a/sbuildbot/master.cfg
+++ b/sbuildbot/master.cfg
@@ -80,4 +80,4 @@ c['projectURL'] = "http://www.sugarlabs.org/"
 # with an externally-visible host name which the buildbot cannot figure out
 # without some help.
 
-c['buildbotURL'] = "http://buildbot.sugarlabs.org/"
+c['buildbotURL'] = "https://buildbot.sugarlabs.org/"
diff --git a/sbuildbot/template.html b/sbuildbot/template.html
index 7ef22e7..1111ca2 100644
--- a/sbuildbot/template.html
+++ b/sbuildbot/template.html
@@ -10,12 +10,12 @@
 <div id="page">
 <ul id="general">
 <li id="siteaction-sugarlabs_home" class="home"><a href="http://wiki.sugarlabs.org/">Home</a></li>
-<li id="siteaction-sugarlabs_trac"><a href="http://dev.sugarlabs.org/">Trac</a></li>
+<li id="siteaction-sugarlabs_trac"><a href="https://bugs.sugarlabs.org/">Trac</a></li>
 <li id="siteaction-sugarlabs_plant"><a href="http://planet.sugarlabs.org/">Planet</a></li>
 <li id="siteaction-sugarlabs_list"><a href="http://lists.sugarlabs.org/">Lists</a></li>
 <li id="siteaction-sugarlabs_schools"><a href="http://schools.sugarlabs.org/">Schools</a></li>
-<li id="siteaction-sugarlabs_download"><a href="http://download.sugarlabs.org/">Download</a></li>
-<li id="siteaction-sugarlabs_api"><a href="http://api.sugarlabs.org/">API</a></li>
+<li id="siteaction-sugarlabs_download"><a href="https://download.sugarlabs.org/">Download</a></li>
+<li id="siteaction-sugarlabs_api"><a href="https://api.sugarlabs.org/">API</a></li>
 <li id="siteaction-sugarlabs_git"><a href="http://git.sugarlabs.org/">Gitorious</a></li>
 </ul>
 <div id="header">
@@ -23,8 +23,8 @@
 
  <div id="tabs">
   <ul id="portal-globalnav">
-    <li id="portaltab-0" class="selected"><a href="http://buildbot.sugarlabs.org"><span>Sugar</span></a></li>
-    <li id="portaltab-1"><a href="http://sugarlabs.org/go/Development_Team"><span>Developers</span></a></li>
+    <li id="portaltab-0" class="selected"><a href="https://buildbot.sugarlabs.org"><span>Sugar</span></a></li>
+    <li id="portaltab-1"><a href="http://wiki.sugarlabs.org/go/Development_Team"><span>Developers</span></a></li>
   </ul>
  </div>
 </div>
diff --git a/sbuildbot/ubuntu-lucid-64bit.xml b/sbuildbot/ubuntu-lucid-64bit.xml
new file mode 100644
index 0000000..9418bf5
--- /dev/null
+++ b/sbuildbot/ubuntu-lucid-64bit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<botslave>
+  <config>
+    <run_checks>yes</run_checks>
+    <scheduler>nightly</scheduler>
+  </config>
+  <nightly_scheduler>
+    <!-- only ints for now (not lists) so only a single run -->
+    <hour>3</hour>
+    <minute>5</minute>
+  </nightly_scheduler>
+  <info>
+    <distribution>Ubuntu</distribution>
+    <version>Lucid</version>
+    <architecture>amd64</architecture>
+  </info>
+</botslave>