Merge remote-tracking branch 'origin/f15/master'

Conflicts:
	.gitignore
	gsettings-desktop-schemas.spec
	sources

.gitignore

@@ -8,3 +8,4 @@ gsettings-desktop-schemas-0.0.1.git20100729.tar.bz2
 /gsettings-desktop-schemas-0.1.5.tar.bz2
 /gsettings-desktop-schemas-0.1.7.tar.bz2
 /gsettings-desktop-schemas-2.91.91.tar.bz2
+/gsettings-desktop-schemas-2.91.92.tar.bz2

0001-schemas-Remove-at-mobility-schema-conversion.patch

@@ -0,0 +1,27 @@
+From e2e8a52260f79e6afd4ff242327feff7b798eb49 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 9 Mar 2011 17:44:24 +0000
+Subject: [PATCH] schemas: Remove at mobility schema conversion
+
+Spotted by Matthias Clasen <mclasen@redhat.com>
+---
+ schemas/gsettings-desktop-schemas.convert |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/schemas/gsettings-desktop-schemas.convert b/schemas/gsettings-desktop-schemas.convert
+index afd8ad7..d7172dd 100644
+--- a/schemas/gsettings-desktop-schemas.convert
++++ b/schemas/gsettings-desktop-schemas.convert
+@@ -19,9 +19,6 @@ autorun-x-content-ignore = /apps/nautilus/preferences/media_autorun_x_content_ig
+ autorun-x-content-open-folder = /apps/nautilus/preferences/media_autorun_x_content_open_folder
+ 
+ # From org.gnome.desktop.default-applications.gschema.xml
+-[org.gnome.desktop.default-applications.at.mobility]
+-exec = /desktop/gnome/applications/at/mobility/exec
+-
+ [org.gnome.desktop.default-applications.office.calendar]
+ exec = /desktop/gnome/applications/calendar/exec
+ needs-term = /desktop/gnome/applications/calendar/needs_term
+-- 
+1.7.4.1
+

gsettings-desktop-schemas.spec

@@ -1,5 +1,5 @@
 Name:           gsettings-desktop-schemas
-Version:        2.91.91
+Version:        2.91.92
 Release:        1%{?dist}
 Summary:        A collection of GSettings schemas
 
@@ -16,7 +16,6 @@ BuildRequires: intltool
 
 Requires: glib2 >= 2.25.11
 
-
 %description
 gsettings-desktop-schemas contains a collection of GSettings schemas for
 settings shared by various components of a desktop.
@@ -27,14 +26,13 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-The %{name}-devel package contains libraries 
+The %{name}-devel package contains libraries
 and header files for developing applications that use %{name}.
 
 
 %prep
 %setup -q
 
-
 %build
 %configure --disable-schemas-compile
 make %{?_smp_mflags}
@@ -69,9 +67,19 @@ fi
 
 
 %changelog
+* Mon Mar 21 2011 Matthias Clasen <mclasen@redhat.com> 2.91.92-1
+- Update to 2.91.92
+
+* Wed Mar 09 2011 Bastien Nocera <bnocera@redhat.com> 2.91.91-2
+- Fix possible crasher when converting schemas
+
 * Tue Mar 08 2011 Bastien Nocera <bnocera@redhat.com> 2.91.91-1
 - Update to 2.91.91
 
+* Thu Feb 24 2011 Colin Walters <walters@verbum.org> - 0.1.7-2
+- Add patch from git to disable a11y by default; it makes
+  gnome-shell totally unusable right now
+
 * Mon Feb 21 2011 Bastien Nocera <bnocera@redhat.com> 0.1.7-1
 - Update to 0.1.7
 

sources

@@ -1 +1 @@
-7acffaaae8495a4f15e1412f4da9c497  gsettings-desktop-schemas-2.91.91.tar.bz2
+498e5ea8ab43ee39f4e0e2262a78936b  gsettings-desktop-schemas-2.91.92.tar.bz2