From d631d38c4d8441176b154a0afc631371b6db6af7 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <sascha-org-sugar-git@silbe.org>
Date: Wed, 08 Apr 2009 22:28:56 +0000
Subject: update telepathy to 0.3.9 as requested in SL#695

---
(limited to 'config')

diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index ab7026f..1a5bb19 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -91,11 +91,9 @@
   <autotools id="telepathy-gabble"
              autogen-sh="configure">
     <branch repo="telepathy"
-            version="0.7.21"
-            module="telepathy-gabble/telepathy-gabble-0.7.21.tar.gz"
-            size="1597740" md5sum="8b86d4fa82eb2c8cc5dc64f300596ae7">
-      <patch file="telepathy-gabble-chmod-unix-socket.patch" strip="1"/>
-      <patch file="telepathy-gabble-olpc-no-dbus-uid-check.patch" strip="1"/>
+            version="0.7.25"
+            module="telepathy-gabble/telepathy-gabble-0.7.25.tar.gz"
+            size="1732475" md5sum="5fae7fbfb8e40be28e8dae5cba5cb947">
     </branch>
     <dependencies>
       <dep package="telepathy-glib"/>
@@ -117,13 +115,11 @@
     </dependencies>
   </autotools>
   <autotools id="telepathy-salut"
-             autogen-sh="configure" autogenargs="--enable-olpc">
+             autogen-sh="configure" autogenargs="--enable-olpc --enable-ssl">
     <branch repo="telepathy"
-            version="0.3.8"
-            module="telepathy-salut/telepathy-salut-0.3.8.tar.gz"
-            size="1072311" md5sum="5c67655054059a1dfa647d64dd8b3260">
-       <patch file="telepathy-salut-chmod-unix-socket.patch" strip="1"/>
-       <patch file="telepathy-salut-olpc-no-dbus-uid-check.patch" strip="1"/>
+            version="0.3.9"
+            module="telepathy-salut/telepathy-salut-0.3.9.tar.gz"
+            size="1172347" md5sum="b61b6f8a86b07a10315c4cca9d78b4fa">
     </branch>
     <dependencies>
       <dep package="telepathy-glib"/>
@@ -131,9 +127,9 @@
     </dependencies>
   </autotools>
   <autotools id="telepathy-glib" autogen-sh="configure">
-    <branch repo="telepathy" version="0.7.26"
-            module="telepathy-glib/telepathy-glib-0.7.26.tar.gz"
-            size="2356388" md5sum="359596b07ee124e1b1897f4341a43862" />
+    <branch repo="telepathy" version="0.7.29"
+            module="telepathy-glib/telepathy-glib-0.7.29.tar.gz"
+            size="5009792" md5sum="ae67d4fe42c7e337813754cb5927b6cc" />
   </autotools>
   <distutils id="telepathy-python">
     <branch module="telepathy-python/telepathy-python-0.15.7.tar.gz"
diff --git a/config/sysdeps/debian-unstable.xml b/config/sysdeps/debian-unstable.xml
index 816479e..02c2bd7 100644
--- a/config/sysdeps/debian-unstable.xml
+++ b/config/sysdeps/debian-unstable.xml
@@ -45,6 +45,7 @@
   <package name="libpoppler-glib-dev"/>
   <package name="libpopt-dev"/>
   <package name="librsvg2-dev"/>
+  <package name="libssl-dev"/>
   <package name="libsoup2.4-dev" source="libsoup"/>
   <package name="libsqlite3-dev"/>
   <package name="libtool"/>
diff --git a/config/sysdeps/fedora-10.xml b/config/sysdeps/fedora-10.xml
index d5691e8..c130600 100644
--- a/config/sysdeps/fedora-10.xml
+++ b/config/sysdeps/fedora-10.xml
@@ -47,6 +47,7 @@
   <package name="matchbox-window-manager" source="matchbox-window-manager"/>
   <package name="numpy"/>
   <package name="olpcsound-devel"/>
+  <package name="openssl-devel"/>
   <package name="poppler-glib-devel"/>
   <package name="popt-devel"/>
   <package name="pyabiword" source="pyabiword"/>
diff --git a/config/sysdeps/fedora-rawhide.xml b/config/sysdeps/fedora-rawhide.xml
index d5691e8..c130600 100644
--- a/config/sysdeps/fedora-rawhide.xml
+++ b/config/sysdeps/fedora-rawhide.xml
@@ -47,6 +47,7 @@
   <package name="matchbox-window-manager" source="matchbox-window-manager"/>
   <package name="numpy"/>
   <package name="olpcsound-devel"/>
+  <package name="openssl-devel"/>
   <package name="poppler-glib-devel"/>
   <package name="popt-devel"/>
   <package name="pyabiword" source="pyabiword"/>
diff --git a/config/sysdeps/ubuntu-8.10.xml b/config/sysdeps/ubuntu-8.10.xml
index 38779c1..d6f05e2 100644
--- a/config/sysdeps/ubuntu-8.10.xml
+++ b/config/sysdeps/ubuntu-8.10.xml
@@ -38,6 +38,7 @@
   <package name="libpoppler-glib-dev"/>
   <package name="libpopt-dev"/>
   <package name="librsvg2-dev"/>
+  <package name="libssl-dev"/>
   <package name="libsoup2.4-dev" source="libsoup"/>
   <package name="libtool"/>
   <package name="libwv-dev"/>
diff --git a/config/sysdeps/ubuntu-9.04.xml b/config/sysdeps/ubuntu-9.04.xml
index 9d2b1ed..3c84daf 100644
--- a/config/sysdeps/ubuntu-9.04.xml
+++ b/config/sysdeps/ubuntu-9.04.xml
@@ -45,6 +45,7 @@
   <package name="libpoppler-glib-dev"/>
   <package name="libpopt-dev"/>
   <package name="librsvg2-dev"/>
+  <package name="libssl-dev"/>
   <package name="libsoup2.4-dev" source="libsoup"/>
 <!--  <package name="libsqlite3-dev"/> -->
   <package name="libtool"/>
--
cgit v0.9.1