Update to 3.1.92

This commit is contained in:
Bastien Nocera 2011-09-19 13:42:11 +01:00
parent 671f78e686
commit ef026ce4de
4 changed files with 6 additions and 52 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ gsettings-desktop-schemas-0.0.1.git20100729.tar.bz2
/gsettings-desktop-schemas-3.0.1.tar.bz2
/gsettings-desktop-schemas-3.1.3.tar.xz
/gsettings-desktop-schemas-3.1.91.tar.xz
/gsettings-desktop-schemas-3.1.92.tar.bz2

View File

@ -1,50 +0,0 @@
From 2762c8a92ca3ac41b7054a4849d49dddc9058828 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 7 Apr 2011 10:06:24 -0400
Subject: [PATCH] Remove some questionable conversions
We can't convert picture-filename to picture-uri, since a filename
is not a uri, and then the other picture-related keys don't make sense
to migrate. And we really don't want to migrate show-desktop-icons
and draw-background. Or any of the GTK+ tweak keys.
---
schemas/gsettings-desktop-schemas.convert | 19 -------------------
1 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/schemas/gsettings-desktop-schemas.convert b/schemas/gsettings-desktop-schemas.convert
index 960e6b4..95e6c6d 100644
--- a/schemas/gsettings-desktop-schemas.convert
+++ b/schemas/gsettings-desktop-schemas.convert
@@ -1,14 +1,3 @@
-# From org.gnome.desktop.background.gschema.xml.in
-[org.gnome.desktop.background]
-draw-background = /desktop/gnome/background/draw_background
-picture-options = /desktop/gnome/background/picture_options
-picture-uri = /desktop/gnome/background/picture_filename
-picture-opacity = /desktop/gnome/background/picture_opacity
-primary-color = /desktop/gnome/background/primary_color
-secondary-color = /desktop/gnome/background/secondary_color
-color-shading-type = /desktop/gnome/background/color_shading_type
-show-desktop-icons = /apps/nautilus/preferences/show_desktop
-
# From org.gnome.desktop-media-handling.gschema.xml.in
[org.gnome.desktop.media-handling]
automount = /apps/nautilus/preferences/media_automount
@@ -35,14 +24,6 @@ exec-arg = /desktop/gnome/applications/terminal/exec_arg
[org.gnome.desktop.interface]
toolkit-accessibility = /desktop/gnome/interface/accessibility
enable-animations = /desktop/gnome/interface/enable_animations
-menus-have-tearoff = /desktop/gnome/interface/menus_have_tearoff
-can-change-accels = /desktop/gnome/interface/can_change_accels
-toolbar-style = /desktop/gnome/interface/toolbar_style
-menus-have-icons = /desktop/gnome/interface/menus_have_icons
-buttons-have-icons = /desktop/gnome/interface/buttons_have_icons
-menubar-detachable = /desktop/gnome/interface/menubar_detachable
-toolbar-detachable = /desktop/gnome/interface/toolbar_detachable
-toolbar-icons-size = /desktop/gnome/interface/toolbar_icons_size
# Disabled, as we want users to use the new default:
# https://bugzilla.gnome.org/show_bug.cgi?id=634639
# cursor-blink = /desktop/gnome/interface/cursor_blink
--
1.7.4.2

View File

@ -1,5 +1,5 @@
Name: gsettings-desktop-schemas
Version: 3.1.91
Version: 3.1.92
Release: 1%{?dist}
Summary: A collection of GSettings schemas
@ -66,6 +66,9 @@ fi
%changelog
* Mon Sep 19 2011 Bastien Nocera <bnocera@redhat.com> 3.1.92-1
- Update to 3.1.92
* Tue Sep 6 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.91-1
- Update to 3.1.91

View File

@ -1 +1 @@
36ea5ef3357e79e4ed5220870b7e731b gsettings-desktop-schemas-3.1.91.tar.xz
b4bfcec31e390ea480429d81ce645284 gsettings-desktop-schemas-3.1.92.tar.bz2