diff options
Diffstat (limited to 'xorg-server/xkeyboard-config')
| -rw-r--r-- | xorg-server/xkeyboard-config/Makefile.am | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/configure.in | 1 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 1 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/cd.in | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/is | 20 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/xkeyboard-config.spec.in | 45 |
6 files changed, 16 insertions, 55 deletions
diff --git a/xorg-server/xkeyboard-config/Makefile.am b/xorg-server/xkeyboard-config/Makefile.am index 943539fc6..fe8f08c84 100644 --- a/xorg-server/xkeyboard-config/Makefile.am +++ b/xorg-server/xkeyboard-config/Makefile.am @@ -8,8 +8,6 @@ pkgconfig_DATA = xkeyboard-config.pc EXTRA_DIST=config.rpath COPYING CREDITS README \ autogen.sh \ xkeyboard-config.pc.in \ - xkeyboard-config.spec \ - xkeyboard-config.spec.in \ intltool-extract.in intltool-merge.in intltool-update.in DISTCLEANFILES=intltool-extract intltool-merge intltool-update diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in index fa4baef95..82b1e1d4f 100644 --- a/xorg-server/xkeyboard-config/configure.in +++ b/xorg-server/xkeyboard-config/configure.in @@ -111,7 +111,6 @@ symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile types/Makefile xkeyboard-config.pc -xkeyboard-config.spec docs/Makefile man/Makefile ]) diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 8816034a3..47d160e30 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -4779,7 +4779,6 @@ <_description>Taiwanese</_description> <languageList> <iso639Id>trv</iso639Id> - <iso639Id>pwn</iso639Id> </languageList> </configItem> <variantList> diff --git a/xorg-server/xkeyboard-config/symbols/cd.in b/xorg-server/xkeyboard-config/symbols/cd.in index 938bf2b69..78803dbcc 100644 --- a/xorg-server/xkeyboard-config/symbols/cd.in +++ b/xorg-server/xkeyboard-config/symbols/cd.in @@ -30,7 +30,7 @@ xkb_symbols "basic" { key <AD04> { [ r, R ] }; key <AD05> { [ t, T ] }; key <AD06> { [ y, Y ] }; - key <AD07> { [ u, U, 0x01000289, 0x01001d7e ] }; + key <AD07> { [ u, U, 0x01000289, 0x01000244 ] }; key <AD08> { [ i, I, 0x01000268, 0x01000197 ] }; key <AD09> { [ o, O, oslash, Ooblique ] }; key <AD10> { [ p, P ] }; diff --git a/xorg-server/xkeyboard-config/symbols/is b/xorg-server/xkeyboard-config/symbols/is index c40b8a965..f8e0ce133 100644 --- a/xorg-server/xkeyboard-config/symbols/is +++ b/xorg-server/xkeyboard-config/symbols/is @@ -2,6 +2,10 @@ // XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is // fixes by Olafur Osvaldsson - oli@isnic.is // +// "basic" corrected according to the Icelandic standard for keyboards, +// IST 125:1995 (some symbols substituted by a dead diacritic). +// Some positions are according to IST ISO/IEC 9995-3:1994 +// Added nobreakspace default partial alphanumeric_keys xkb_symbols "basic" { @@ -10,21 +14,27 @@ xkb_symbols "basic" { name[Group1]="Icelandic"; +// <AE00> = <TLDE> key <AE02> { [ 2, quotedbl, twosuperior, oneeighth ] }; key <AE04> { [ 4, dollar, onequarter, currency ] }; key <AE11> { [odiaeresis, Odiaeresis, backslash, questiondown ] }; - key <AE12> { [ minus, underscore, ccedilla, dead_ogonek ] }; + key <AE12> { [ minus, underscore, dead_cedilla, dead_ogonek ] }; key <AD11> { [ eth, ETH, dead_diaeresis, dead_abovering ] }; - key <AD12> { [apostrophe, question, asciitilde, dead_macron ] }; + key <AD12> { [apostrophe, question, dead_tilde, dead_macron ] }; key <AC10> { [ ae, AE, asciicircum, dead_doubleacute ] }; - key <AC11> { [dead_acute, dead_circumflex, dead_circumflex ] }; - key <TLDE> { [ degree, diaeresis, notsign, notsign ] }; + key <AC11> { [dead_acute, dead_acute, dead_circumflex, dead_caron ] }; + key <TLDE> { [dead_abovering, dead_diaeresis, notsign, hyphen ] }; - key <BKSL> { [ plus, asterisk, grave, dead_breve ] }; +// <AC12> = <BKSL> + key <BKSL> { [ plus, asterisk, dead_grave, dead_breve ] }; + +// <AB00> = <LSGT>, is in file "pc": pc105 key <AB10> { [ thorn, THORN, dead_belowdot, dead_abovedot ] }; + key <SPCE> { [ space, space, nobreakspace, nobreakspace ] }; + include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/xkeyboard-config.spec.in b/xorg-server/xkeyboard-config/xkeyboard-config.spec.in deleted file mode 100644 index 0b2082af7..000000000 --- a/xorg-server/xkeyboard-config/xkeyboard-config.spec.in +++ /dev/null @@ -1,45 +0,0 @@ -Name: xkeyboard-config -Summary: XML-based XKB configuration registry -Version: @VERSION@ -Release: 1 -License: X11/MIT -Group: User Interface/X - -Url: http://gswitchit.sourceforge.net/ - -Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root - -BuildArch: noarch - -%description -Just XML stuff. Later hopefully will be part of XFree86 - -%prep -%setup -q - -%build - -if [ ! -f configure ]; then - CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh -fi - -CFLAGS="$RPM_OPT_FLAGS" ./configure - -make - -%install -rm -rf $RPM_BUILD_ROOT - -make prefix=$RPM_BUILD_ROOT%{_prefix} install -rm -rf $RPM_BUILD_ROOT%{_prefix}/share/locale - -%clean -rm -rf %{buildroot} -rm -rf $RPM_BUILD_DIR/%{name}-%{version} - -%files -%defattr(-, root, root) - -%doc AUTHORS CREDITS ChangeLog NEWS README COPYING docs/README.config docs/README.enhancing docs/README.symbols docs/HOWTO.transition docs/HOWTO.testing -%{_prefix}/lib/X11/xkb/* |