Accepting request 39528 from X11:XOrg

Copy from X11:XOrg/xkeyboard-config based on submit request 39528 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/39528
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=33
This commit is contained in:
OBS User autobuild 2010-05-07 13:51:44 +00:00 committed by Git OBS Bridge
parent 4df016cfcd
commit d9a58cefd6
4 changed files with 55 additions and 4 deletions

View File

@ -0,0 +1,39 @@
commit 81d931301ecdeadf2120e5f18b3df20824db6c9c
Author: Sergey V. Udaltsov <svu@gnome.org>
Date: Thu May 6 01:26:04 2010 +0100
Added several chars to hu layout
https://bugs.freedesktop.org/show_bug.cgi?id=27825
diff --git a/symbols/hu b/symbols/hu
index 4280098..e5abdf2 100644
--- a/symbols/hu
+++ b/symbols/hu
@@ -329,7 +329,7 @@ xkb_symbols "def_101" {
// The standard Hungaryan qwertz layout
hidden partial alphanumeric_keys
xkb_symbols "def_qwertz" {
- key <AD06> { [ z, Z ] };
+ key <AD06> { [ z, Z, endash ] };
key <AB01> { [ y, Y, greater ] };
};
@@ -338,7 +338,7 @@ xkb_symbols "def_qwertz" {
// The qwerty layout for people who familiar with the standard US layout
hidden partial alphanumeric_keys
xkb_symbols "def_qwerty" {
- key <AD06> { [ y, Y ] };
+ key <AD06> { [ y, Y, endash ] };
key <AB01> { [ z, Z, greater ] };
};
@@ -396,6 +396,8 @@ xkb_symbols "def_common" {
key <AD02> { [ w, W, bar ] };
key <AD07> { [ u, U, EuroSign ] };
key <AD08> { [ i, I, Iacute, iacute ] };
+ key <AD09> { [ o, O, doublelowquotemark ] };
+ key <AD10> { [ p, P, rightdoublequotemark ] };
key <AD11> { [ odoubleacute, Odoubleacute, division ] };
key <AD12> { [ uacute, Uacute, multiply ] };

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu May 6 06:58:38 CEST 2010 - sndirsch@suse.de
- xkeyboard-config-commit-81d9313.diff
* Added several chars to hu layout (bnc #599318, bfo #27825)
- xkeyboard-config.inet.microsoftpro.patch
* fixed inet:media_common mapping (bnc #602129)
* changed inet:microsoftpro mapping to inet(microsoftprousb),
since inet(microsoftpro) no longer exists (bnc #602129)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 4 21:14:23 CET 2009 - sndirsch@suse.de Fri Dec 4 21:14:23 CET 2009 - sndirsch@suse.de

View File

@ -4,8 +4,8 @@
esperanto:qwerty = +epo(qwerty) esperanto:qwerty = +epo(qwerty)
esperanto:dvorak = +epo(dvorak) esperanto:dvorak = +epo(dvorak)
terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp)
+ inet:microsoftpro = +inet(microsoftpro) + inet:microsoftpro = +inet(microsoftprousb)
+ inet:media_common = +inet(nav_common) + inet:media_common = +inet(media_common)
+ inet:nav_common = +inet(nav_common) + inet:nav_common = +inet(nav_common)
+ +

View File

@ -1,7 +1,7 @@
# #
# spec file for package xkeyboard-config (Version 1.7) # spec file for package xkeyboard-config (Version 1.7)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -28,7 +28,7 @@ Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
PreReq: /bin/ln /bin/rm PreReq: /bin/ln /bin/rm
AutoReqProv: on AutoReqProv: on
Version: 1.7 Version: 1.7
Release: 2 Release: 3
Summary: The X Keyboard Extension Summary: The X Keyboard Extension
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
Patch4: xkeyboard-config.mainline-cvs.mac-es.patch Patch4: xkeyboard-config.mainline-cvs.mac-es.patch
@ -42,6 +42,7 @@ Patch108: microsoftnek4k-keycodes.diff
Patch109: disable-2xalt_2xctrl-toggle.diff Patch109: disable-2xalt_2xctrl-toggle.diff
Patch110: MDSW-change-keycode.diff Patch110: MDSW-change-keycode.diff
Patch115: xkeyboard-config.inet.microsoftpro.patch Patch115: xkeyboard-config.inet.microsoftpro.patch
Patch116: xkeyboard-config-commit-81d9313.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
@ -73,6 +74,7 @@ Authors:
%patch109 -p1 %patch109 -p1
%patch110 %patch110
%patch115 -p0 %patch115 -p0
%patch116 -p1
%build %build
%configure --with-xkb-rules-symlink=xfree86,xorg \ %configure --with-xkb-rules-symlink=xfree86,xorg \