[Commits] sugar-jhbuild branch master updated.

[Morgan Collett]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "/home/olpc-code/git/sugar-jhbuild".

The branch, master has been updated
       via  21ec87982a6d9c3dfa4a613401792abf6933be1f (commit)
       via  3c3b79f5be58eeedf659194c6984a9b77ac484b9 (commit)
       via  01cf229624c5e15bbf943eeb84fc4eac1a0bcfb8 (commit)
      from  c72fa42e651e5c09780eccc8c3fe242935fa3116 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

 config/modulesets/glucose-external.modules         |    6 +++---
 .../telepathy-salut-chmod-unix-socket.patch        |   17 +++++++++--------
 config/sysdeps/ubuntu-8.10.xml                     |    4 +++-
 3 files changed, 15 insertions(+), 12 deletions(-)

- Log -----------------------------------------------------------------
commit 21ec87982a6d9c3dfa4a613401792abf6933be1f
Author: Morgan Collett <morgan.collett at gmail.com>
Date:   Wed Dec 3 12:28:42 2008 +0200

    Add ubuntu intrepid deps for tp-salut 0.3.6

diff --git a/config/sysdeps/ubuntu-8.10.xml b/config/sysdeps/ubuntu-8.10.xml
index c11dea4..3b46957 100644
--- a/config/sysdeps/ubuntu-8.10.xml
+++ b/config/sysdeps/ubuntu-8.10.xml
@@ -52,6 +52,8 @@
   <package name="libpoppler-dev"/>
   <package name="python-gobject"
 	   source="pygobject"/>
-   <package name="xulrunner-1.9-dev"
+  <package name="xulrunner-1.9-dev"
 	   source="xulrunner"/>
+  <package name="libsoup2.2-dev"/>
+  <package name="libglib2.0-dev"/>
 </dependencies>

commit 3c3b79f5be58eeedf659194c6984a9b77ac484b9
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Dec 2 17:43:39 2008 +0000

     upgrade telepathy-salut-chmod-unix-socket.patch for telepathy-salut 0.3.6

diff --git a/config/modulesets/patches/telepathy-salut-chmod-unix-socket.patch b/config/modulesets/patches/telepathy-salut-chmod-unix-socket.patch
index 5d36941..b6ba1b0 100644
--- a/config/modulesets/patches/telepathy-salut-chmod-unix-socket.patch
+++ b/config/modulesets/patches/telepathy-salut-chmod-unix-socket.patch
@@ -1,14 +1,15 @@
-diff -rN -u old-telepathy-salut-rainbow/src/tube-stream.c new-telepathy-salut-rainbow/src/tube-stream.c
---- old-telepathy-salut-rainbow/src/tube-stream.c	2007-12-11 16:03:02.000000000 +0100
-+++ new-telepathy-salut-rainbow/src/tube-stream.c	2007-12-11 16:03:02.000000000 +0100
-@@ -637,6 +637,9 @@
-               "Error binding socket: %s", g_strerror (errno));
+diff --git a/src/tube-stream.c b/src/tube-stream.c
+index 290bde6..bbc69a2 100644
+--- a/src/tube-stream.c
++++ b/src/tube-stream.c
+@@ -736,6 +736,10 @@ tube_stream_open (SalutTubeStream *self,
+           g_free (path);
            return FALSE;
          }
 +
 +      /* Everyone can use the socket */
-+      chmod (addr.sun_path, 0777);
++      chmod (path, 0777);
++
+       g_free (path);
      }
    else if (priv->address_type == TP_SOCKET_ADDRESS_TYPE_IPV4)
-     {
-

commit 01cf229624c5e15bbf943eeb84fc4eac1a0bcfb8
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Dec 2 17:43:16 2008 +0000

    upgrade to telepathy-salut-0.3.6

diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index 4b058ba..e6f50ba 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -113,9 +113,9 @@
   <autotools id="telepathy-salut"
              autogen-sh="configure" autogenargs="--enable-olpc">
     <branch repo="telepathy"
-            version="0.3.5"
-            module="telepathy-salut/telepathy-salut-0.3.5.tar.gz"
-            size="938665" md5sum="6d0ea6298e23b0c1f4453f0f143f3c57">
+            version="0.3.6"
+            module="telepathy-salut/telepathy-salut-0.3.6.tar.gz"
+            size="1058109" md5sum="ccd02baafbbd708c11e4f770715065f4">
        <patch file="telepathy-salut-chmod-unix-socket.patch" strip="1"/>
        <patch file="telepathy-salut-olpc-no-dbus-uid-check.patch" strip="1"/>
     </branch>
-----------------------------------------------------------------------


--
/home/olpc-code/git/sugar-jhbuild