[jhbuild] 3.10: folks depends on libzeitgeist-2.0, included in the zeitgeist package

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

commit 8f23326ab2c73c4e45f721f77a1553ef928b3760
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Jul 9 16:55:12 2013 +0100

    3.10: folks depends on libzeitgeist-2.0, included in the zeitgeist package

 modulesets/gnome-suites-core-deps-3.10.modules |   19 ++++++++++++++++++-
 modulesets/gnome-sysdeps-3.10.modules          |    6 ------
 modulesets/gnome-world-3.10.modules            |   17 -----------------
 3 files changed, 18 insertions(+), 24 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.10.modules b/modulesets/gnome-suites-core-deps-3.10.modules
index 09d0727..ae46d3b 100644
--- a/modulesets/gnome-suites-core-deps-3.10.modules
+++ b/modulesets/gnome-suites-core-deps-3.10.modules
@@ -413,7 +413,7 @@
       <dep package="gobject-introspection"/>
       <dep package="telepathy-glib"/>
       <dep package="evolution-data-server"/>
-      <dep package="libzeitgeist"/>
+      <dep package="zeitgeist"/>
       <dep package="shared-mime-info"/>
     </dependencies>
     <suggests>
@@ -1302,4 +1302,21 @@
     </dependencies>
   </autotools>
 
+  <autotools id="zeitgeist">
+    <branch repo="git.freedesktop.org"
+            module="zeitgeist/zeitgeist"
+            checkoutdir="zeitgeist"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="sqlite3"/>
+      <dep package="vala"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="json-glib"/>
+      <dep package="telepathy-glib"/>
+    </suggests>
+  </autotools>
+
 </moduleset>
diff --git a/modulesets/gnome-sysdeps-3.10.modules b/modulesets/gnome-sysdeps-3.10.modules
index 0e12142..ec168f6 100644
--- a/modulesets/gnome-sysdeps-3.10.modules
+++ b/modulesets/gnome-sysdeps-3.10.modules
@@ -505,12 +505,6 @@
       </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="libzeitgeist">
-    <pkg-config>zeitgeist-1.0.pc</pkg-config>
-    <branch repo="system"
-            version="0.3.18"/>
-  </systemmodule>
-
   <systemmodule id="mpfr">
     <branch repo="system"/>
     <systemdependencies>
diff --git a/modulesets/gnome-world-3.10.modules b/modulesets/gnome-world-3.10.modules
index 8d3c576..7aa2ff0 100644
--- a/modulesets/gnome-world-3.10.modules
+++ b/modulesets/gnome-world-3.10.modules
@@ -2223,23 +2223,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="zeitgeist">
-    <branch repo="git.freedesktop.org"
-            module="zeitgeist/zeitgeist"
-            checkoutdir="zeitgeist"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="sqlite3"/>
-      <dep package="vala"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="json-glib"/>
-      <dep package="telepathy-glib"/>
-    </suggests>
-  </autotools>
-
   <distutils id="fungtk">
     <branch repo="launchpad.net"
             module="fungtk"/>