[releng] [release] Second update for 2.31.6

[Vincent Untz <vuntz src gnome org>]

commit c86a5051fe4a2e6670ea9f3285178441d9dc385b
Author: Vincent Untz <vuntz gnome org>
Date:   Thu Aug 5 18:49:22 2010 +0200

    [release] Second update for 2.31.6
    
    We have a few new versions for modules, and the limit for vte has been
    removed (it was wrong).

 tools/smoketesting/tarball-conversion.config |    8 ++++----
 tools/versions                               |   14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/tools/smoketesting/tarball-conversion.config b/tools/smoketesting/tarball-conversion.config
index 032417e..c68a5eb 100644
--- a/tools/smoketesting/tarball-conversion.config
+++ b/tools/smoketesting/tarball-conversion.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- FIXME 2.32: eog, epiphany, glade3, gnome-color-manager, gnome-packagekit, gnome-power-manager, nautilus, totem are all at 2.30 (or 3.6 for glade) because the 2.31/2.90 versions depend on GTK+ 3 -->
+<!-- FIXME 2.32: epiphany, gnome-color-manager, gnome-packagekit, gnome-power-manager, nautilus are all at 2.30 because the 2.31/2.90 versions depend on GTK+ 3 -->
 <conversioninfo>
   <locations>  FIXME: get a better name
     <site cvs="gnome.org" 
@@ -193,7 +193,7 @@
     <package name="deskbar-applet"          set="desktop"/>
     <package name="ekiga"                   set="desktop"/>
     <package name="empathy"                 set="desktop"/>
-    <package name="eog"                     set="desktop" limit="2.31"/>
+    <package name="eog"                     set="desktop" limit="2.90"/>
     <package name="epiphany"                set="desktop" limit="2.31"/>
     <package name="evince"                  set="desktop"/>
     <package name="evolution"               set="desktop"/>
@@ -285,7 +285,7 @@
     <package name="totem-pl-parser"         set="desktop"/>
     <package name="vinagre"                 set="desktop" limit="2.31"/> <!-- 2.31.x is moving to GTK+ 3 and is for 3.0 -->
     <package name="vino"                    set="desktop"/>
-    <package name="vte"                     set="desktop" limit="0.25"/>
+    <package name="vte"                     set="desktop"/>
     <!-- Uncomment for 3.0 <package name="vte-3"                   set="desktop" module="vte"/> -->
     <package name="yelp"                    set="desktop" limit="2.31"/> <!-- 2.31.x is moving to GTK+ 3 and is for 3.0 -->
     <package name="yelp-xsl"                set="desktop"/>
@@ -297,7 +297,7 @@
     <package name="anjuta"                  set="devtools"/>
     <package name="devhelp"                 set="devtools" limit="2.90"/>
     <package name="gdl"                     set="devtools" limit="2.31"/> <!-- 2.31.x/2.90.x is moving to GTK+ 3 and is for 3.0 -->
-    <package name="glade3"                  set="devtools" limit="3.7"/>
+    <package name="glade3"                  set="devtools" limit="3.7"/> <!-- 3.7.x is moving to GTK+ 3 and is for 3.0 -->
     <package name="accerciser"              set="devtools"/>
     <package name="gnome-devel-docs"        set="devtools"/>
     ## BINDINGS
diff --git a/tools/versions b/tools/versions
index ba710d8..2c32913 100644
--- a/tools/versions
+++ b/tools/versions
@@ -35,7 +35,7 @@ desktop:dconf:0.5:
 desktop:deskbar-applet:2.30.1:
 desktop:ekiga:3.2.7:
 desktop:empathy:2.31.6:
-desktop:eog:2.30.2:
+desktop:eog:2.31.5:
 desktop:epiphany:2.30.2:
 desktop:evince:2.31.6.1:
 desktop:evolution:2.31.6:
@@ -45,7 +45,7 @@ desktop:evolution-mapi:0.31.6:
 desktop:evolution-webcal:2.31.2:
 desktop:file-roller:2.31.5:
 desktop:gcalctool:5.31.6:
-desktop:gconf-editor:2.31.5:
+desktop:gconf-editor:2.31.6:
 desktop:gdm:2.31.2:
 desktop:gedit:2.30.3:
 desktop:gnome-applets:2.31.6:
@@ -58,14 +58,14 @@ desktop:gnome-desktop-sharp:2.26.0:
 desktop:gnome-disk-utility:2.30.1:
 desktop:gnome-doc-utils:0.20.1:
 desktop:gnome-games:2.31.6:
-desktop:gnome-icon-theme:2.30.3:
+desktop:gnome-icon-theme:2.31.0:
 desktop:gnome-icon-theme-symbolic:2.30.0:
 desktop:gnome-keyring:2.31.4:
 desktop:gnome-mag:0.16.1:
 desktop:gnome-media:2.31.6:
 desktop:gnome-menus:2.30.2:
 desktop:gnome-netstatus:2.28.1:
-desktop:gnome-nettool:2.31.5:
+desktop:gnome-nettool:2.31.6:
 desktop:gnome-packagekit:2.30.3:
 desktop:gnome-panel:2.31.6:
 desktop:gnome-power-manager:2.30.1:
@@ -82,7 +82,7 @@ desktop:gnome-terminal:2.31.3:
 desktop:gnome-themes:2.31.6:
 desktop:gnome-user-docs:2.30.1:
 desktop:gnome-user-share:2.30.0:
-desktop:gnome-utils:2.30.0:
+desktop:gnome-utils:2.31.1:
 desktop:gobject-introspection:0.9.3:
 desktop:gst-plugins-base:0.10.30:
 desktop:gst-plugins-good:0.10.24:
@@ -121,7 +121,7 @@ desktop:totem:2.30.2:
 desktop:totem-pl-parser:2.30.2:
 desktop:vinagre:2.30.2:
 desktop:vino:2.31.4:
-desktop:vte:0.24.3:
+desktop:vte:0.25.1:
 desktop:yelp:2.30.1:
 desktop:yelp-xsl:2.31.5:
 desktop:zenity:2.31.5:
@@ -132,7 +132,7 @@ admin:sabayon:2.30.0:
 
 ## DEVTOOLS
 devtools:accerciser:1.11.1:
-devtools:anjuta:2.31.6.0:
+devtools:anjuta:2.31.6.1:
 devtools:devhelp:2.31.6:
 devtools:gdl:2.30.0:
 devtools:glade3:3.6.7: