[releng] [release] Second update for 2.31.92

[Vincent Untz <vuntz src gnome org>]

commit 3d86682ec8e0feed86704ec8319a89a444d1777d
Author: Vincent Untz <vuntz gnome org>
Date:   Sun Sep 19 02:20:48 2010 +0200

    [release] Second update for 2.31.92
    
    We need gok instead of caribou, and we don't want gnome-shell and
    mutter.

 tools/smoketesting/tarball-conversion.config |   12 ++++++++----
 tools/versions                               |   10 ++++------
 2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/tools/smoketesting/tarball-conversion.config b/tools/smoketesting/tarball-conversion.config
index 1fd2766..9700684 100644
--- a/tools/smoketesting/tarball-conversion.config
+++ b/tools/smoketesting/tarball-conversion.config
@@ -1,5 +1,8 @@
 <?xml version="1.0" ?>
-<!-- FIXME 2.32: epiphany is at 2.30 because the 2.31 versions depend on GTK+ 3 -->
+<!-- FIXME 2.32: epiphany is at 2.30 because the 2.31 versions depend on GTK+ 3
+                 caribou, gnome-shell, mutter are commented out
+                 gnome-speech and gok should get removed for 3.0
+-->
 <conversioninfo>
   <locations>  FIXME: get a better name
     <site cvs="gnome.org" 
@@ -186,7 +189,7 @@
     <package name="at-spi2-atk"             set="desktop"/>
     <package name="brasero"                 set="desktop"/>
     <package name="bug-buddy"               set="desktop"/>
-    <package name="caribou"                 set="desktop"/>
+    <!-- Uncomment for 3.0 <package name="caribou"                 set="desktop"/> -->
     <package name="cheese"                  set="desktop"/>
     <package name="dasher"                  set="desktop"/>
     <package name="dconf"                   set="desktop"/>
@@ -234,7 +237,7 @@
     <package name="gnome-sharp"             set="desktop"/>
     <package name="gnome-desktop-sharp"     set="desktop"/>
     <package name="gnome-speech"            set="desktop"/>
-    <package name="gnome-shell"             set="desktop"/>
+    <!-- Uncomment for 3.0 <package name="gnome-shell"             set="desktop"/> -->
     <package name="gnome-system-monitor"    set="desktop"/>
     <package name="gnome-system-tools"      set="desktop"/>
     <package name="gnome-terminal"          set="desktop"/>
@@ -243,6 +246,7 @@
     <package name="gnome-utils"             set="desktop"/>
     <package name="gnome-user-docs"         set="desktop"/>
     <package name="gobject-introspection"   set="desktop"/>
+    <package name="gok"                     set="desktop"/>
     <!-- In MOBILE too, keep the limits synchronized -->
     <package name="gstreamer"               set="desktop"/>
     <!-- In MOBILE too, keep the limits synchronized -->
@@ -270,7 +274,7 @@
     <package name="libwnck"                 set="desktop"/>
     <package name="metacity"                set="desktop"/>
     <package name="mousetweaks"             set="desktop"/>
-    <package name="mutter"                  set="desktop"/>
+    <!-- Uncomment for 3.0 <package name="mutter"                  set="desktop"/> -->
     <package name="nautilus"                set="desktop" limit="2.90"/>
     <package name="nautilus-sendto"         set="desktop" limit="2.90"/>
     <package name="orca"                    set="desktop"/>
diff --git a/tools/versions b/tools/versions
index d571668..af467bc 100644
--- a/tools/versions
+++ b/tools/versions
@@ -28,7 +28,6 @@ desktop:at-spi2-atk:0.3.92:
 desktop:at-spi2-core:0.3.92:
 desktop:brasero:2.31.92:
 desktop:bug-buddy:2.31.92:
-desktop:caribou:0.1.5:
 desktop:cheese:2.31.92:
 desktop:dasher:4.11:
 desktop:dconf:0.5.1:
@@ -74,7 +73,6 @@ desktop:gnome-screensaver:2.30.0:
 desktop:gnome-session:2.31.6:
 desktop:gnome-settings-daemon:2.31.92:
 desktop:gnome-sharp:2.24.1:
-desktop:gnome-shell:2.31.5:
 desktop:gnome-speech:0.4.25:
 desktop:gnome-system-monitor:2.28.1:
 desktop:gnome-system-tools:2.31.92:
@@ -84,6 +82,7 @@ desktop:gnome-user-docs:2.30.1:
 desktop:gnome-user-share:2.30.0:
 desktop:gnome-utils:2.31.1:
 desktop:gobject-introspection:0.9.6:
+desktop:gok:2.30.0:
 desktop:gst-plugins-base:0.10.30:
 desktop:gst-plugins-good:0.10.25:
 desktop:gstreamer:0.10.30:
@@ -106,7 +105,6 @@ desktop:libsoup:2.31.92:
 desktop:libwnck:2.30.4:
 desktop:metacity:2.30.2:
 desktop:mousetweaks:2.31.92:
-desktop:mutter:2.31.5:
 desktop:nautilus:2.31.92:
 desktop:nautilus-sendto:2.31.90:
 desktop:orca:2.31.92:
@@ -170,13 +168,13 @@ bindings:seed:2.31.91:js
 bindings:gtk-sharp:2.12.10:mono
 
 # Perl
-bindings:Glib:1.223:perl
+bindings:Glib:1.222:perl
 bindings:Gnome2-Canvas:1.002:perl
-bindings:Gnome2-GConf:1.043:perl
+bindings:Gnome2-GConf:1.044:perl
 bindings:Gnome2-VFS:1.081:perl
 bindings:Gnome2:1.042:perl
 bindings:Gtk2-GladeXML:1.007:perl
-bindings:Gtk2:1.222:perl
+bindings:Gtk2:1.221:perl
 bindings:Pango:1.221:perl
 
 # Python