From a27a4d50135081f68fd810fcbd1c24aa556a2dca3acffb1303be5ad610aef7c9 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 6 Aug 2010 12:29:25 +0000 Subject: [PATCH] Accepting request 44718 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-control-center via accept of submit request 44718 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44718 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=74 --- gnome-control-center-2.30.0.tar.bz2 | 3 - gnome-control-center-2.31.6.tar.bz2 | 3 + ...r-bnc373197-layout-switch-keybinding.patch | 12 ---- gnome-control-center.changes | 57 +++++++++++++++++++ gnome-control-center.spec | 11 ++-- 5 files changed, 65 insertions(+), 21 deletions(-) delete mode 100644 gnome-control-center-2.30.0.tar.bz2 create mode 100644 gnome-control-center-2.31.6.tar.bz2 delete mode 100644 gnome-control-center-bnc373197-layout-switch-keybinding.patch diff --git a/gnome-control-center-2.30.0.tar.bz2 b/gnome-control-center-2.30.0.tar.bz2 deleted file mode 100644 index 6e41824..0000000 --- a/gnome-control-center-2.30.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa279706d7a1a4f5a4ba4767cc80ac3cae2855d3bc6600b5c039dc650d754828 -size 2887049 diff --git a/gnome-control-center-2.31.6.tar.bz2 b/gnome-control-center-2.31.6.tar.bz2 new file mode 100644 index 0000000..51dfa4f --- /dev/null +++ b/gnome-control-center-2.31.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0793c5e1f9e8ba16d8d06d0f8398775f3a0f8f5593b704ced43fbf1e1d2f5df +size 2858178 diff --git a/gnome-control-center-bnc373197-layout-switch-keybinding.patch b/gnome-control-center-bnc373197-layout-switch-keybinding.patch deleted file mode 100644 index 5848306..0000000 --- a/gnome-control-center-bnc373197-layout-switch-keybinding.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aurp gnome-control-center-2.22.1/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c gnome-control-center-2.22.1-patched/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c ---- gnome-control-center-2.22.1/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c 2008-03-27 14:12:29.000000000 +0100 -+++ gnome-control-center-2.22.1-patched/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c 2008-05-13 10:33:19.480124000 +0200 -@@ -37,7 +37,7 @@ - #include "gnome-keyboard-properties-xkb.h" - - #define GROUP_SWITCHERS_GROUP "grp" --#define DEFAULT_GROUP_SWITCH "grp:alts_toggle" -+#define DEFAULT_GROUP_SWITCH "grp:shifts_toggle" - #define DEFAULT_VARIANT_ID "__default__" - - enum { diff --git a/gnome-control-center.changes b/gnome-control-center.changes index a1beee9..e09c497 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Fri Aug 6 12:43:46 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.31.6: + + Common: + - Replace deprecated GTK+ symbols (bgo#572325) + + About me: + - Don't hang when new and old password are too similar + - Catch "password too recent" error message (bgo#620135) + + Font viewer: + - Create the preview pixmap after the drawing area is realized + + Keyboard: + - Changing Print layout to Show layout + + Shell: + - Don't include both Personal and Look & Feel + + Updated translations. +- Changes from version 2.31.1: + + Common: + - Use only single GTK+ includes (bgo#615292) + - Remove GTK+ deprecated symbols (bgo#572325) + + About me: + - Don't hang when new and old password only differ in case + - Minor string updates (bgo#615283) + - Use changes-prevent and changes-allow icons from the + icon-them instead of the outdated lock-icons (bgo#408585) + - Use accessor functions instead direct access (bgo#597888) + + Display: + - Add a "Make Default" button in gnome-display-properties, + which is used to set up a systemwide default RANDR + configuration + - Change icon name to preferences-desktop-display (bgo#614912) + + Keyboard: + - Added tooltips (bgo#615521) + - Use new libgnomekbd function for default group switcher + (bgo#603806) + - Proper response id for the help button (bgo#616917) + + Shell: + - Fix issue with g-c-c shell and YaST shell having same unique + identifier + + Typing break: + - Add support for Ubuntu's app indicator + + Updated translations. +- Drop + gnome-control-center-bnc373197-layout-switch-keybinding.patch: + not needed anymore, since this is now handled in libgnomekbd + (that we patched). +- Remove libcanberra-gtk Requires: packaging of libcanberra has + changed, and the login sound will get installed via a Supplements + there. + +------------------------------------------------------------------- +Thu Apr 29 14:24:22 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.30.1: + + Don't hang when new and old password only differ in case + + Updated translations. + ------------------------------------------------------------------- Mon Mar 29 17:48:18 CEST 2010 - vuntz@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 782655d..b8ab558 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-control-center (Version 2.30.0) +# spec file for package gnome-control-center (Version 2.31.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ License: GPLv2+ Group: System/GUI/GNOME Obsoletes: fontilus themus acme Provides: fontilus themus acme -Version: 2.30.0 +Version: 2.31.6 Release: 1 Summary: The GNOME Control Center Source: %{name}-%{version}.tar.bz2 @@ -54,12 +54,10 @@ Patch1: gnome-control-center-bnc427745-force-dpi.patch Patch14: gnome-control-center-system-proxy-configuration.patch # PATCH-FEATURE-OPENSUSE gnome-control-center-use-settings-menu.patch Patch28: gnome-control-center-use-settings-menu.patch -# PATCH-FIX-OPENSUSE gnome-control-center-bnc373197-layout-switch-keybinding.patch bnc373197 vuntz@novell.com -- this is a temporary hack to change the default layout switching keybinding -Patch30: gnome-control-center-bnc373197-layout-switch-keybinding.patch # PATCH-FIX-UPSTREAM gnome-control-center-bnc436206-add-to-default.patch bnc436206 sreeves@novell.com -- Add groupwise to defaults list Patch31: gnome-control-center-bnc436206-add-to-default.patch Url: http://www.gnome.org -Requires: nautilus gnome-settings-daemon gnome-menus libcanberra-gtk +Requires: nautilus gnome-settings-daemon gnome-menus Requires: %{name}-lang = %{version} Provides: control-center2 = 2.22.1 Obsoletes: control-center2 < 2.22.1 @@ -112,7 +110,6 @@ gnome-patch-translation-prepare #NEEDS-REBASE #%patch14 -p1 %patch28 -%patch30 -p1 %patch31 -p1 gnome-patch-translation-update @@ -179,6 +176,7 @@ fi %files -f %{name}.schemas_list %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO +%{_sbindir}/gnome-display-properties-install-systemwide %{_bindir}/* %{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/applications/*.desktop @@ -188,6 +186,7 @@ fi %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg %{_datadir}/mime/packages/*.xml +%{_datadir}/polkit-1/actions/org.gnome.randr.policy %{_sysconfdir}/xdg/menus/gnomecc.menu %files lang -f %{name}-2.0.lang