diff --git a/gnome-settings-daemon-2.25.90.tar.bz2 b/gnome-settings-daemon-2.25.90.tar.bz2 deleted file mode 100644 index c852acb..0000000 --- a/gnome-settings-daemon-2.25.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:969943ae047cdbe62f601b629996e7791352a76c1856768daae96348fbb617f0 -size 1156164 diff --git a/gnome-settings-daemon-2.25.92.tar.bz2 b/gnome-settings-daemon-2.25.92.tar.bz2 new file mode 100644 index 0000000..05ed5b1 --- /dev/null +++ b/gnome-settings-daemon-2.25.92.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fc19581896822c84b207f51fadae29d7b69433526c73efc99efc9b1eef48cec +size 1114325 diff --git a/gnome-settings-daemon-bnc369263-broken-xkb-layout.patch b/gnome-settings-daemon-bnc369263-broken-xkb-layout.patch deleted file mode 100644 index 016d5e9..0000000 --- a/gnome-settings-daemon-bnc369263-broken-xkb-layout.patch +++ /dev/null @@ -1,29 +0,0 @@ -This is really only a workaround to unbreak things on startup. We need more -time to investigate what the real fix is, and we don't have enough time for -openSUSE 11.0. - -Index: gnome-settings-daemon-2.22.1/plugins/keyboard/gsd-keyboard-manager.c -=================================================================== ---- gnome-settings-daemon-2.22.1.orig/plugins/keyboard/gsd-keyboard-manager.c -+++ gnome-settings-daemon-2.22.1/plugins/keyboard/gsd-keyboard-manager.c -@@ -410,6 +410,7 @@ gsd_keyboard_manager_start (GsdKeyboardM - GError **error) - { - GConfClient *client; -+ char *program; - - gnome_settings_profile_start (NULL); - -@@ -430,6 +431,12 @@ gsd_keyboard_manager_start (GsdKeyboardM - apply_settings (client, 0, NULL, manager); - g_object_unref (client); - -+ program = g_find_program_in_path ("setxkbmap"); -+ if (program != NULL) { -+ g_spawn_command_line_async (program, NULL); -+ g_free (program); -+ } -+ - gnome_settings_profile_end (NULL); - - return TRUE; diff --git a/gnome-settings-daemon-bnc473980-unknown-media-key.patch b/gnome-settings-daemon-bnc473980-unknown-media-key.patch deleted file mode 100644 index 189d57e..0000000 --- a/gnome-settings-daemon-bnc473980-unknown-media-key.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: plugins/common/eggaccelerators.c -=================================================================== ---- plugins/common/eggaccelerators.c (révision 706) -+++ plugins/common/eggaccelerators.c (copie de travail) -@@ -358,6 +358,8 @@ egg_accelerator_parse_virtual (const gch - } - } - } -+ else -+ bad_keyval = TRUE; - } - else if (accelerator_codes != NULL) - { diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 4b61134..9f28e20 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Mar 10 21:53:17 CET 2009 - vuntz@novell.com + +- Drop gnome-settings-daemon-bnc369263-broken-xkb-layout.patch: we + now have a recent enough X server. Fix bnc#483651. + +------------------------------------------------------------------- +Fri Mar 6 13:49:34 CET 2009 - vuntz@novell.com + +- Update to version 2.25.92: + + don't print warnings for disabled custom shortcuts + + revert screen resolution change if the user closes the + confirmation window using the close icon or by pressing escape + (bgo#571492) + + add missing keys for a11y shortcut keys to GConf schemas + (bgo#572807) + + install gnome-settings-daemon-plugin.h for custom plugin + developement (bgo#573610) + + Updated translations. +- Drop gnome-settings-daemon-bnc473980-unknown-media-key.patch: + fixed upstream. + ------------------------------------------------------------------- Thu Feb 19 04:20:38 CET 2009 - vuntz@novell.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 484edfa..ff11e0e 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-settings-daemon (Version 2.25.90) +# spec file for package gnome-settings-daemon (Version 2.25.92) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -35,20 +35,16 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11 License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.25.90 -Release: 2 +Version: 2.25.92 +Release: 1 Summary: Settings daemon for the GNOME desktop Source: %{_name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.diff Patch2: gnome-settings-daemon-system-proxy-configuration.diff -# PATCH-FIX-UPSTREAM gnome-settings-daemon-bnc369263-broken-xkb-layout.patch bnc369263 bfo16105 vuntz@novell.com -- This is a hack to fix a major bug. -Patch4: gnome-settings-daemon-bnc369263-broken-xkb-layout.patch # PATCH-FIX-UPSTREAM gnome-settings-daemon-bnc427745-force-dpi.patch bnc427745 bgo553652 vuntz@novell.com -- Force the DPI to 96 right now to avoid big fonts. Patch6: gnome-settings-daemon-bnc427745-force-dpi.patch # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-apport-monitor.patch bnc439203 jblunck@novell.com -- Add apport monitoring plugin. Patch8: gnome-settings-daemon-apport-monitor.patch -# PATCH-FIX-UPSTREAM gnome-settings-daemon-bnc473980-unknown-media-key.patch bnc473980 bgo571329 vuntz@novell.com -Patch9: gnome-settings-daemon-bnc473980-unknown-media-key.patch # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-bnc462640-mute-action.patch bnc462640 bgo572365 vuntz@novell.com -- Mute button should always mute sound instead of toggling mute status Patch10: gnome-settings-daemon-bnc462640-mute-action.patch Url: http://www.gnome.org @@ -106,10 +102,8 @@ Authors: %setup -q -n %{_name}-%{version} gnome-patch-translation-prepare %patch2 -p1 -%patch4 -p1 %patch6 -p1 %patch8 -p1 -%patch9 -p0 %patch10 -p1 gnome-patch-translation-update @@ -164,6 +158,22 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Tue Mar 10 2009 vuntz@novell.com +- Drop gnome-settings-daemon-bnc369263-broken-xkb-layout.patch: we + now have a recent enough X server. Fix bnc#483651. +* Fri Mar 06 2009 vuntz@novell.com +- Update to version 2.25.92: + + don't print warnings for disabled custom shortcuts + + revert screen resolution change if the user closes the + confirmation window using the close icon or by pressing escape + (bgo#571492) + + add missing keys for a11y shortcut keys to GConf schemas + (bgo#572807) + + install gnome-settings-daemon-plugin.h for custom plugin + developement (bgo#573610) + + Updated translations. +- Drop gnome-settings-daemon-bnc473980-unknown-media-key.patch: + fixed upstream. * Thu Feb 19 2009 vuntz@novell.com - Add gnome-settings-daemon-bnc462640-mute-button-always-mute.patch to make it possible to always mute sound instead of toggling mute