[releng] Forgotten 3.1.1 changes

[Matthias Clasen <matthiasc src gnome org>]

commit 3cb48af5bda299ed50e142fa21b53f27c205c143
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon May 23 08:27:33 2011 -0400

    Forgotten 3.1.1 changes

 tools/smoketesting/sample-tarball.jhbuildrc  |    5 ++++-
 tools/smoketesting/tarball-conversion.config |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/tools/smoketesting/sample-tarball.jhbuildrc b/tools/smoketesting/sample-tarball.jhbuildrc
index ed2f6cd..eb6e4e2 100644
--- a/tools/smoketesting/sample-tarball.jhbuildrc
+++ b/tools/smoketesting/sample-tarball.jhbuildrc
@@ -7,7 +7,8 @@
 # 'gnome-suites-core-3.0', but it can be any of the files in the
 # modulesets directory, or even the URL of a module set file on
 # a web server.
-moduleset = 'gnome-apps-2.91.93'
+use_local_modulesets = True
+moduleset = 'gnome-apps-3.2'
 
 # A list of the modules to build.  Defaults to the Gnome Desktop and
 # developer platform.
@@ -71,6 +72,8 @@ skip.append('pulseaudio')
 
 # do not build cheese at the moment, as it has an unapproved dependency on mx
 skip.append('cheese')
+skip.append('libxml2')
+skip.append('libxslt')
 
 # libxml2, libxslt, and gamin are totally inconsistent with the rest of Gnome
 # about python.  See
diff --git a/tools/smoketesting/tarball-conversion.config b/tools/smoketesting/tarball-conversion.config
index bf08959..8bf9cf8 100644
--- a/tools/smoketesting/tarball-conversion.config
+++ b/tools/smoketesting/tarball-conversion.config
@@ -317,6 +317,7 @@
     <package name="ORBit2"/>
     <package name="at-spi"/>
     <package name="audiofile"/>
+    <package name="clutter-gst"/>
     <package name="esound"/>
     <package name="gnome-mime-data"/>
     <package name="gnome-vfs"/>