From f39b6ebc09a9ec7665ab67875857fc340dd9130c5c02d78b0d3c91cf02f547ad Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 21 Oct 2015 10:08:13 +0000 Subject: [PATCH] Accepting request 340122 from home:tobijk:X11:XOrg - Rename n_suse.patch -> n_suse-ctrl-alt-bksp-terminate.patch to reflect patch usage - Rename disable-2xalt_2xctrl-toggle.diff -> n_disable-2xalt_2xctrl-toggle.diff to follow X11:XOrg patch guidelines OBS-URL: https://build.opensuse.org/request/show/340122 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=117 --- ...trl-toggle.diff => n_disable-2xalt_2xctrl-toggle.diff | 0 n_suse.patch => n_suse-ctrl-alt-bksp-terminate.patch | 0 xkeyboard-config.changes | 9 +++++++++ xkeyboard-config.spec | 4 ++-- 4 files changed, 11 insertions(+), 2 deletions(-) rename disable-2xalt_2xctrl-toggle.diff => n_disable-2xalt_2xctrl-toggle.diff (100%) rename n_suse.patch => n_suse-ctrl-alt-bksp-terminate.patch (100%) diff --git a/disable-2xalt_2xctrl-toggle.diff b/n_disable-2xalt_2xctrl-toggle.diff similarity index 100% rename from disable-2xalt_2xctrl-toggle.diff rename to n_disable-2xalt_2xctrl-toggle.diff diff --git a/n_suse.patch b/n_suse-ctrl-alt-bksp-terminate.patch similarity index 100% rename from n_suse.patch rename to n_suse-ctrl-alt-bksp-terminate.patch diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index d0c6d2b..6163c3e 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Oct 20 14:59:44 UTC 2015 - tobias.johannes.klausmann@mni.thm.de + +- Rename n_suse.patch -> n_suse-ctrl-alt-bksp-terminate.patch to + reflect patch usage +- Rename disable-2xalt_2xctrl-toggle.diff -> + n_disable-2xalt_2xctrl-toggle.diff to follow X11:XOrg patch + guidelines + ------------------------------------------------------------------- Tue Oct 20 14:40:37 UTC 2015 - sndirsch@suse.com diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 5927365..80d6844 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -34,9 +34,9 @@ Summary: The X Keyboard Extension License: GPL-2.0+ and LGPL-2.1+ and MIT and CDDL-1.0 Group: System/X11/Utilities Source: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-%{version}.tar.bz2 -Patch100: n_suse.patch +Patch100: n_suse-ctrl-alt-bksp-terminate.patch # PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed -Patch109: disable-2xalt_2xctrl-toggle.diff +Patch109: n_disable-2xalt_2xctrl-toggle.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Recommends: %{name}-lang