From c0fdd9141b69a264ab15540ba718eeb5262eaa39fc721daf65e349a6d4d47b4b Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Sep 2012 15:34:48 +0000 Subject: [PATCH 1/2] Accepting request 132754 from GNOME:Next Starting to push GNOME:Next... OBS-URL: https://build.opensuse.org/request/show/132754 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgnomekbd?expand=0&rev=63 --- libgnomekbd-3.4.0.2.tar.xz | 3 --- libgnomekbd-3.5.90.tar.xz | 3 +++ libgnomekbd-default-group-switch.patch | 12 ++++++------ libgnomekbd.changes | 15 +++++++++++++++ libgnomekbd.spec | 4 ++-- 5 files changed, 26 insertions(+), 11 deletions(-) delete mode 100644 libgnomekbd-3.4.0.2.tar.xz create mode 100644 libgnomekbd-3.5.90.tar.xz diff --git a/libgnomekbd-3.4.0.2.tar.xz b/libgnomekbd-3.4.0.2.tar.xz deleted file mode 100644 index ae04c55..0000000 --- a/libgnomekbd-3.4.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e6c8956adbd39f1c3a8ec5c77bcf7ffbdaa54320398015d1174cd5003664e39 -size 368552 diff --git a/libgnomekbd-3.5.90.tar.xz b/libgnomekbd-3.5.90.tar.xz new file mode 100644 index 0000000..2548f3a --- /dev/null +++ b/libgnomekbd-3.5.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba80b783b46c6bd0eb0725aab422b218656f85533a3bd543b9233994f4cecd70 +size 370824 diff --git a/libgnomekbd-default-group-switch.patch b/libgnomekbd-default-group-switch.patch index a0546ca..0b0a881 100644 --- a/libgnomekbd-default-group-switch.patch +++ b/libgnomekbd-default-group-switch.patch @@ -1,7 +1,7 @@ -diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c -index 51c6ce4..7c01781 100644 ---- a/libgnomekbd/gkbd-keyboard-config.c -+++ b/libgnomekbd/gkbd-keyboard-config.c +Index: libgnomekbd-3.5.2/libgnomekbd/gkbd-keyboard-config.c +=================================================================== +--- libgnomekbd-3.5.2.orig/libgnomekbd/gkbd-keyboard-config.c ++++ libgnomekbd-3.5.2/libgnomekbd/gkbd-keyboard-config.c @@ -35,7 +35,7 @@ */ @@ -9,5 +9,5 @@ index 51c6ce4..7c01781 100644 -#define DEFAULT_GROUP_SWITCH "grp:shift_caps_toggle" +#define DEFAULT_GROUP_SWITCH "grp:shifts_toggle" - #define XMODMAP_CMD "xmodmap" - + const gchar GKBD_KEYBOARD_CONFIG_KEY_MODEL[] = "model"; + const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[] = "layouts"; diff --git a/libgnomekbd.changes b/libgnomekbd.changes index 0861fb3..657e688 100644 --- a/libgnomekbd.changes +++ b/libgnomekbd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Aug 25 13:30:49 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.90: + + Updated translations. + +------------------------------------------------------------------- +Sun Jun 10 13:23:03 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.2: + + Removed xmodmap support, would be handled in g-s-d through the + scripts. + + Some minor build fixes. +- Rebase libgnomekbd-default-group-switch.patch. + ------------------------------------------------------------------- Wed Mar 28 06:37:19 UTC 2012 - vuntz@opensuse.org diff --git a/libgnomekbd.spec b/libgnomekbd.spec index 2b74bcd..121fa16 100644 --- a/libgnomekbd.spec +++ b/libgnomekbd.spec @@ -17,13 +17,13 @@ Name: libgnomekbd -Version: 3.4.0.2 +Version: 3.5.90 Release: 0 Summary: GNOME Keyboard Library License: LGPL-2.1+ Group: System/GUI/GNOME Url: http://www.gnome.org/ -Source: http://download.gnome.org/sources/libgnomekbd/3.4/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/libgnomekbd/3.5/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE libgnomekbd-default-group-switch.patch vuntz@opensuse.org -- We use shifts_toggle to switch between groups in openSUSE Patch0: libgnomekbd-default-group-switch.patch # For %%desktop_database_* macros From 7d232bc972c9635c96ff4b92cd6252e159c50d5c977ee8745da5e3e41e04f4b8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 25 Sep 2012 20:36:06 +0000 Subject: [PATCH 2/2] Accepting request 135908 from home:dimstar:branches:GNOME:Factory Update to 3.6.0 OBS-URL: https://build.opensuse.org/request/show/135908 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgnomekbd?expand=0&rev=64 --- libgnomekbd-3.5.90.tar.xz | 3 --- libgnomekbd-3.6.0.tar.xz | 3 +++ libgnomekbd.changes | 6 ++++++ libgnomekbd.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 libgnomekbd-3.5.90.tar.xz create mode 100644 libgnomekbd-3.6.0.tar.xz diff --git a/libgnomekbd-3.5.90.tar.xz b/libgnomekbd-3.5.90.tar.xz deleted file mode 100644 index 2548f3a..0000000 --- a/libgnomekbd-3.5.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba80b783b46c6bd0eb0725aab422b218656f85533a3bd543b9233994f4cecd70 -size 370824 diff --git a/libgnomekbd-3.6.0.tar.xz b/libgnomekbd-3.6.0.tar.xz new file mode 100644 index 0000000..752f737 --- /dev/null +++ b/libgnomekbd-3.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09 +size 373588 diff --git a/libgnomekbd.changes b/libgnomekbd.changes index 657e688..c10410b 100644 --- a/libgnomekbd.changes +++ b/libgnomekbd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 25 14:58:33 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.6.0: + + Updated translations. + ------------------------------------------------------------------- Sat Aug 25 13:30:49 UTC 2012 - dimstar@opensuse.org diff --git a/libgnomekbd.spec b/libgnomekbd.spec index 121fa16..247ca1b 100644 --- a/libgnomekbd.spec +++ b/libgnomekbd.spec @@ -17,13 +17,13 @@ Name: libgnomekbd -Version: 3.5.90 +Version: 3.6.0 Release: 0 Summary: GNOME Keyboard Library License: LGPL-2.1+ Group: System/GUI/GNOME Url: http://www.gnome.org/ -Source: http://download.gnome.org/sources/libgnomekbd/3.5/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/libgnomekbd/3.6/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE libgnomekbd-default-group-switch.patch vuntz@opensuse.org -- We use shifts_toggle to switch between groups in openSUSE Patch0: libgnomekbd-default-group-switch.patch # For %%desktop_database_* macros