[jhbuild] [2.32] Move caribou out of gnome-suites, add back gok

[Vincent Untz <vuntz src gnome org>]

commit d900e6b09d503ab7aea539ed33c074621e44c1ab
Author: Vincent Untz <vuntz gnome org>
Date:   Sun Sep 19 02:11:00 2010 +0200

    [2.32] Move caribou out of gnome-suites, add back gok
    
    The accessibility team asked to use gok for 2.32.

 modulesets/gnome-2.32.modules        |    7 +++++++
 modulesets/gnome-suites-2.32.modules |   23 ++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/modulesets/gnome-2.32.modules b/modulesets/gnome-2.32.modules
index 6ebe133..882a2e4 100644
--- a/modulesets/gnome-2.32.modules
+++ b/modulesets/gnome-2.32.modules
@@ -2608,5 +2608,12 @@
     </after>
   </autotools>
 
+  <autotools id="caribou">
+    <branch/>
+    <dependencies>
+      <dep package="pygtk"/>
+      <dep package="pyclutter"/>
+    </dependencies>
+  </autotools>
 
 </moduleset>
diff --git a/modulesets/gnome-suites-2.32.modules b/modulesets/gnome-suites-2.32.modules
index 68874bb..db426cf 100644
--- a/modulesets/gnome-suites-2.32.modules
+++ b/modulesets/gnome-suites-2.32.modules
@@ -290,14 +290,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="caribou">
-    <branch/>
-    <dependencies>
-      <dep package="pygtk"/>
-      <dep package="pyclutter"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="cheese">
     <branch revision="gnome-2-32"/>
     <dependencies>
@@ -1037,6 +1029,19 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gok">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="at-spi"/>
+      <dep package="gtk+"/>
+      <dep package="libwnck"/>
+      <dep package="libcanberra"/>
+      <dep package="rarian"/>
+      <dep package="gnome-speech"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gstreamer" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org" module="gstreamer"/>
     <dependencies>
@@ -1825,7 +1830,6 @@
       <dep package="alacarte"/>
       <dep package="brasero"/>
       <dep package="bug-buddy"/>
-      <dep package="caribou"/>
       <dep package="cheese"/>
       <dep package="gnome-control-center"/>
       <dep package="dasher"/>
@@ -1878,6 +1882,7 @@
       <dep package="gnome-user-share"/>
       <dep package="gnome-utils"/>
       <dep package="gobject-introspection"/>
+      <dep package="gok"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>