- Put "Meta_acute" back in German keymaps, just ignore it in (loadkeys -u)

(patch by Jochen Schmitt)
This commit is contained in:
Miloslav Trmac 2005-02-20 21:27:36 +00:00
parent 8dce19e7bb
commit 5aaa2af534
2 changed files with 16 additions and 3 deletions

11
kbd-1.12-Meta_utf8.patch Normal file
View File

@ -0,0 +1,11 @@
--- kbd-1.12/src/ksyms.c.org 2005-01-11 16:38:32.000000000 +0100
+++ kbd-1.12/src/ksyms.c 2005-01-11 16:46:19.000000000 +0100
@@ -1710,6 +1710,8 @@
keycode = ksymtocode(s+5);
if (KTYP(keycode) == KT_LATIN)
return K(KT_META, KVAL(keycode));
+ else if(prefer_unicode)
+ return (0);
/* fall through to error printf */
}

View File

@ -17,7 +17,7 @@ Patch1: kbd-1.08-compose.patch
Patch2: kbd-1.08-terminal.patch
Patch3: kbd-1.08-rukbd.patch
Patch4: kbd-1.12-setfont-man.patch
Patch5: kbd-1.12-Meta_acute.patch
Patch5: kbd-1.12-Meta_utf8.patch
Obsoletes: console-tools
Provides: console-tools
Conflicts: util-linux < 2.11r-9
@ -37,7 +37,7 @@ fonts, the virtual terminals and font files.
%patch2 -p1 -b .terminal
%patch3 -p1
%patch4 -p1 -b .man
%patch5 -p1
%patch5 -p1 -b .Meta_utf8
# 7-bit maps are obsolete; so are non-euro maps
pushd data/keymaps/i386
@ -121,7 +121,9 @@ install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \
%changelog
* Sun Feb 20 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-5
- Don't ship patch backup files, second attempt
- Put "Meta_acute" back in German keymaps, just ignore it in (loadkeys -u)
(patch by Jochen Schmitt)
- Don't ship patch backup files, simpler way
* Sat Feb 19 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-4
- Don't ship a patch backup file