Ticket #2228: 0001-Update-the-versions-of-our-telepathy-dependencies-an.patch

config/modulesets/glucose-external-0.84.modules

@@ -98 +98 @@
       <dep package="telepathy-glib"/>
       <dep package="dbus-glib"/>
       <dep package="libsoup"/>
+      <dep package="sqlite3"/>
+      <dep package="libuuid"/>
+      <dep package="libnice"/>
     </dependencies>
   </autotools>
   <autotools id="libsoup">

config/modulesets/glucose-external.modules

@@ -81 +81 @@
   <autotools id="telepathy-gabble"
              autogen-sh="configure">
     <branch repo="telepathy"
-            version="0.8.9"
-            module="telepathy-gabble/telepathy-gabble-0.8.9.tar.gz"
-            size="1493009" md5sum="ddf89b1eea2f418a68b1013427eb0cb1">
+            version="0.9.16"
+            module="telepathy-gabble/telepathy-gabble-0.9.16.tar.gz"
+            size="2900705" md5sum="7f2ab9256a6202f717bffaf341c99f75">
     </branch>
     <dependencies>
       <dep package="telepathy-glib"/>
@@ -108 +108 @@
   <autotools id="telepathy-salut"
              autogen-sh="configure" autogenargs="--enable-olpc --enable-ssl">
     <branch repo="telepathy"
-            version="0.3.10"
-            module="telepathy-salut/telepathy-salut-0.3.10.tar.gz"
-            size="1190762" md5sum="145580837ba7727f7c97bcfbd1b4a71f">
+            version="0.3.13"
+            module="telepathy-salut/telepathy-salut-0.3.13.tar.gz"
+            size="1209052" md5sum="173448d2680026c5e311f7c97cdda327">
     </branch>
     <dependencies>
       <dep package="telepathy-glib"/>
@@ -118 +118 @@
     </dependencies>
   </autotools>
   <autotools id="telepathy-glib" autogen-sh="configure">
-    <branch repo="telepathy" version="0.9.2"
-            module="telepathy-glib/telepathy-glib-0.9.2.tar.gz"
-            size="2548558" md5sum="83be89144539472eac4ee4a4487f68c4" />
+    <branch repo="telepathy" version="0.11.11"
+            module="telepathy-glib/telepathy-glib-0.11.11.tar.gz"
+            size="2431238" md5sum="ff78ff73851841b47582d5cf99dd5a34" />
     <dependencies>
       <dep package="dbus-glib"/>
     </dependencies>
   </autotools>
   <autotools id="telepathy-python" autogen-sh="configure">
-    <branch module="telepathy-python/telepathy-python-0.15.14.tar.gz"
-            repo="telepathy" version="0.15.14"
-            size="306178" md5sum="058b929055710410f420989c20d5e981"/>
+    <branch module="telepathy-python/telepathy-python-0.15.18.tar.gz"
+            repo="telepathy" version="0.15.18"
+            size="356285" md5sum="51da78a77681b0652d9b4ca941da0658"/>
   </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.92.tar.bz2"
             version="2.25.92" size="1842261" md5sum="5e0d0fc2d900856074b556e4eacc68e6"/>
   </tarball>
+  <autotools id="telepathy-mission-control"
+             autogen-sh="configure">
+    <branch repo="telepathy"
+            version="5.5.3"
+            module="telepathy-mission-control/telepathy-mission-control-5.5.3.tar.gz"
+            size="1245954" md5sum="117528e399d190f66c176e37aefb85d6">
+    </branch>
+    <dependencies>
+      <dep package="telepathy-glib"/>
+    </dependencies>
+  </autotools>
   <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"/>

config/modulesets/glucose.modules

@@ -35 +35 @@
       <dep package="telepathy-gabble"/>
       <dep package="telepathy-salut"/>
       <dep package="telepathy-python"/>
+      <dep package="telepathy-mission-control"/>
     </dependencies>
   </autotools>
   <autotools id="sugar-artwork">

config/sysdeps/50debian-unstable.xml

@@ -4 +4 @@
   <package name="espeak"/>
   <package name="espeak-data"/>
   <package name="libabiword-2.8-dev" source="abiword"/>
-  <package name="libtelepathy-glib0" source="telepathy-glib"/>
   <package name="libdbus-glib-1-dev" source="dbus-glib"/>
   <package name="metacity" source="metacity"/>
   <package name="pep8" source="pep8"/>
@@ -13 +12 @@
   <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="python-xklavier" source="python-xklavier"/>
   <package name="python-xpcom" source="xulrunner"/>
-  <package name="telepathy-gabble" source="telepathy-gabble"/>
-  <package name="telepathy-salut" source="telepathy-salut"/>
   <package name="xulrunner-dev" source="xulrunner"/><!-- for hulahop -->
   <!-- TODO: check whether we actually need these (commented out for Ubuntu 9.04) -->
   <package name="cdbs"/>

config/sysdeps/50ubuntu-10.04.xml

@@ -2 +2 @@
 <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"/>
@@ -10 +9 @@
   <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" source="xulrunner"/><!-- for hulahop -->
 </dependencies>

config/sysdeps/fedora-family.xml

@@ -70 +70 @@
   <package name="python-telepathy" source="telepathy-python"/>
   <package name="pywebkitgtk" /><!-- for Read -->
   <package name="subversion"/>
-  <package name="telepathy-gabble" source="telepathy-gabble"/>
-  <package name="telepathy-glib" source="telepathy-glib"/>
-  <package name="telepathy-salut" source="telepathy-salut"/>
   <package name="tigervnc"/><!-- for sugar-emulator (sugar) -->
   <package name="tigervnc-server"/><!-- for sugar-emulator (sugar) -->
   <package name="wv-devel"/>

sjhbuild/config.py

@@ -61 +61 @@
         # Enable debug log of the Telepathy components
         os.environ.setdefault('GABBLE_DEBUG', 'all')
         os.environ.setdefault('SALUT_DEBUG', 'all')
+        os.environ.setdefault('MC_DEBUG', 'all')
         os.environ.setdefault('STREAM_ENGINE_DEBUG', 'all')
 
+        # Make Mission Control 5 use our accounts dir
+        accounts_dir = os.path.join(os.path.expanduser('~/.sugar'),
+                                    os.environ.get('SUGAR_PROFILE', 'default'),
+                                    'accounts')
+        os.environ.setdefault('MC_ACCOUNT_DIR', accounts_dir)
+
         # We need to add the gtk-2.0 directory explicitly to
         # the Python path since '.pth' files (here pygtk.pth)
         # only work properly in system directories