[gnome-modulesets/gnome-3-4] 3.4: Track telepathy git master repositoriesHEADmaster

[Javier JardÃn <jjardon src gnome org>]

commit b1644a708b9a58d5ec2169c900152cfcd6d6d742
Author: Javier JardÃn <jjardon gnome org>
Date:   Wed Apr 4 01:34:44 2012 +0100

    3.4: Track telepathy git master repositoriesHEADmaster
    
    jhbuild should always be building from actual source code (i.e. git)
    for modules we expect GNOMErs to possibly hack on.
    This set definitely includes telepathy modules, as we already do
    with gstreamer.
    
    As this is a stable release, we track the stable branches of
    this modules

 gnome-suites-core-deps.modules |   17 +++++------------
 gnome-suites-core.modules      |   12 +++++-------
 2 files changed, 10 insertions(+), 19 deletions(-)
---
diff --git a/gnome-suites-core-deps.modules b/gnome-suites-core-deps.modules
index 2bfdbdb..b69b00b 100644
--- a/gnome-suites-core-deps.modules
+++ b/gnome-suites-core-deps.modules
@@ -10,6 +10,8 @@
     href="git://anongit.freedesktop.org/git/"/>
 <repository type="git" name="gstreamer.freedesktop.org"
     href="git://anongit.freedesktop.org/gstreamer/"/>
+<repository type="git" name="telepathy.freedesktop.org"
+    href="git://anongit.freedesktop.org/telepathy/"/>
 <repository type="cvs" name="libxklavier.freedesktop.org"
     cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/xklavier"
     password=""/>
@@ -37,8 +39,6 @@
     href="http://poppler.freedesktop.org/"/>
 <repository type="tarball" name="p11-glue.freedesktop.org"
     href="http://p11-glue.freedesktop.org/releases/"/>
-<repository type="tarball" name="telepathy.freedesktop.org"
-    href="http://telepathy.freedesktop.org/releases/"/>
 <repository type="tarball" name="itstool.org"
     href="http://files.itstool.org/itstool/"/>
 
@@ -293,10 +293,7 @@
   </autotools>
 
   <autotools id="telepathy-farstream" autogenargs="--disable-python">
-    <branch repo="telepathy.freedesktop.org"
-            module="telepathy-farstream/telepathy-farstream-0.2.1.tar.gz"
-            version="0.2.1"
-            hash="sha256:01a0b66fc2d016a7e5b54f02797ad7134b0485e7a6398c3e3c11824a31e94d0c"/>
+    <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
       <dep package="telepathy-glib"/>
       <dep package="farstream"/>
@@ -777,9 +774,7 @@
   <autotools id="telepathy-glib" autogenargs="--enable-vala-bindings">
     <pkg-config>telepathy-glib.pc</pkg-config>
     <branch repo="telepathy.freedesktop.org"
-            module="telepathy-glib/telepathy-glib-0.17.5.tar.gz"
-            version="0.17.5"
-            hash="sha256:011ad936f1d592dbc685073244750303fe2201246b16f9a7fa495cf9f8a3fe8d"/>
+            revision="telepathy-glib-0.18"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus"/>
@@ -795,9 +790,7 @@
   <autotools id="telepathy-logger">
     <pkg-config>telepathy-logger-0.2.pc</pkg-config>
     <branch repo="telepathy.freedesktop.org"
-            module="telepathy-logger/telepathy-logger-0.2.12.tar.bz2"
-            version="0.2.12"
-            hash="sha256:43ce8c6d0309889b56116e9a6eb023e6698962fad72deb1202fee36d64a80199"/>
+            revision="telepathy-logger-0.4"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
diff --git a/gnome-suites-core.modules b/gnome-suites-core.modules
index d903de2..fd299bc 100644
--- a/gnome-suites-core.modules
+++ b/gnome-suites-core.modules
@@ -8,7 +8,9 @@
   <repository type="git" name="git.gnome.org" default="yes"
       href="git://git.gnome.org/"/>
   <repository type="git" name="git.freedesktop.org"
-      href="git://anongit.freedesktop.org/git/"/>
+      href="git://anongit.freedesktop.org/"/>
+  <repository type="git" name="telepathy.freedesktop.org"
+      href="git://anongit.freedesktop.org/telepathy/"/>
   <repository type="git" name="packagekit.gitorious.org"
       href="git://gitorious.org/packagekit"/>
 
@@ -21,8 +23,6 @@
       href="http://freedesktop.org/"/>
   <repository type="tarball" name="kernel.org"
       href="http://www.kernel.org"/>
-  <repository type="tarball" name="telepathy"
-      href="http://telepathy.freedesktop.org/releases/"/>
   <repository type="tarball" name="gnome.org"
       href="http://download.gnome.org/sources/"/>
 
@@ -439,10 +439,8 @@
   </autotools>
 
   <autotools id="telepathy-mission-control">
-    <branch repo="telepathy" module="telepathy-mission-control/telepathy-mission-control-5.9.3.tar.gz"
-            version="5.9.3"
-            hash="sha256:774af104627513e7881fa6695912c962ddedcc7628ec859e020fa30000e32cab"
-            size="991250"/>
+    <branch repo="telepathy"
+            revision="telepathy-mission-control-5.12"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>