From ea3b2a57076e4ced97ebd6a81151720b9921deb7 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Tue, 25 May 2010 15:12:22 -0400
Subject: [PATCH] Update versions for 2.31.2

Update the GNOME Shell version to 2.31.2, and make corresponding
updates to dependencies:

 clutter => 1.2.8
 mutter => 2.31.2
 gobject-introspection => 0.6.11
 gjs => 0.7
---
 configure.ac    | 10 +++++-----
 src/Makefile.am |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 43b526cc5..daf6cc483 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[2.29.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[2.31.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -55,10 +55,10 @@ fi
 
 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
-CLUTTER_MIN_VERSION=1.2.0
-GOBJECT_INTROSPECTION_MIN_VERSION=0.6.9
-GJS_MIN_VERSION=0.6
-MUTTER_MIN_VERSION=2.29.1
+CLUTTER_MIN_VERSION=1.2.8
+GOBJECT_INTROSPECTION_MIN_VERSION=0.6.11
+GJS_MIN_VERSION=0.7
+MUTTER_MIN_VERSION=2.31.2
 GTK_MIN_VERSION=2.18.0
 
 # Collect more than 20 libraries for a prize!
diff --git a/src/Makefile.am b/src/Makefile.am
index 9b59addf8..6200dc559 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -207,7 +207,7 @@ Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) St-1.0.gir libgnome-shell.la Makefile
 		--nsversion=0.1				\
 		--add-include-path=$(MUTTER_LIB_DIR)/mutter/ \
 		--include=Clutter-1.0			\
-		--include=Meta-2.29			\
+		--include=Meta-2.31			\
 		--libtool="$(LIBTOOL)"    \
 		--add-include-path=$(builddir)     \
 		--include=St-1.0     \