[jhbuild/wip/mcatanzaro/core-apps: 14/37] 3.20: Move zeitgeist to world

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 6984fbd72d202b5145fcef342fdc1556e7c94723
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Jan 17 18:59:47 2016 -0600

    3.20: Move zeitgeist to world

 modulesets/gnome-apps-3.20.modules             |    3 ---
 modulesets/gnome-suites-core-3.20.modules      |    3 ---
 modulesets/gnome-suites-core-deps-3.20.modules |   18 ------------------
 modulesets/gnome-world.modules                 |   18 ++++++++++++++++++
 4 files changed, 18 insertions(+), 24 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index c7ed33a..f68c999 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -70,9 +70,6 @@
       <dep package="WebKit1"/>
       <dep package="evolution"/>
     </dependencies>
-    <suggests>
-      <dep package="zeitgeist"/>
-    </suggests>
   </autotools>
 
   <autotools id="dconf-editor">
diff --git a/modulesets/gnome-suites-core-3.20.modules b/modulesets/gnome-suites-core-3.20.modules
index ebd3997..10f73bc 100644
--- a/modulesets/gnome-suites-core-3.20.modules
+++ b/modulesets/gnome-suites-core-3.20.modules
@@ -1011,9 +1011,6 @@
       <dep package="totem-pl-parser"/>
       <dep package="yelp-tools"/>
     </dependencies>
-    <suggests>
-      <dep package="zeitgeist"/>
-    </suggests>
   </autotools>
 
   <autotools id="yelp">
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index d617906..71ad88c 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -1545,22 +1545,4 @@
     </dependencies>
   </autotools>
 
-  <autotools id="zeitgeist" autogenargs="--with-session-bus-services-dir=${prefix}/share/dbus-1/services">
-    <branch repo="git.freedesktop.org"
-            module="zeitgeist/zeitgeist"
-            checkoutdir="zeitgeist"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="rapper"/>
-      <dep package="rdflib"/>
-      <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-world.modules b/modulesets/gnome-world.modules
index ff8a446..700b5be 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -3352,5 +3352,23 @@
     </dependencies>
   </autotools>
 
+  <autotools id="zeitgeist" autogenargs="--with-session-bus-services-dir=${prefix}/share/dbus-1/services">
+    <branch repo="git.freedesktop.org"
+            module="zeitgeist/zeitgeist"
+            checkoutdir="zeitgeist"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="rapper"/>
+      <dep package="rdflib"/>
+      <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>