diff --git a/kbd-1.12-Meta-Tab.diff b/kbd-1.12-Meta-Tab.diff index 1edf35b..076b7f1 100644 --- a/kbd-1.12-Meta-Tab.diff +++ b/kbd-1.12-Meta-Tab.diff @@ -682,17 +682,6 @@ diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/sk-prog-qwerty.map kbd-1.12-3/data keycode 26 = bracketleft braceleft bracketleft braceleft Escape VoidSymbol Escape VoidSymbol Meta_bracketleft Meta_bracketleft Meta_bracketleft Meta_bracketleft keycode 27 = bracketright braceright bracketright braceright Control_bracketright VoidSymbol Control_bracketright VoidSymbol Meta_bracketright Meta_bracketright Meta_bracketright Meta_bracketright keycode 28 = Return -diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/sk-qwerty.map kbd-1.12-3/data/keymaps/i386/qwerty/sk-qwerty.map ---- kbd-1.12-2/data/keymaps/i386/qwerty/sk-qwerty.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwerty/sk-qwerty.map 2004-02-26 22:39:54.000000000 +0100 -@@ -44,6 +44,7 @@ - keycode 13 = equal plus dead_acute dead_circumflex - keycode 14 = Delete - keycode 15 = Tab -+ shift keycode 15 = Meta_Tab - keycode 26 = bracketleft braceleft uacute slash Escape - keycode 27 = bracketright braceright adiaeresis parenleft Control_bracketright - keycode 28 = Return diff -Nur kbd-1.12-2/data/keymaps/i386/qwerty/sv-latin1.map kbd-1.12-3/data/keymaps/i386/qwerty/sv-latin1.map --- kbd-1.12-2/data/keymaps/i386/qwerty/sv-latin1.map 2004-02-26 22:36:33.000000000 +0100 +++ kbd-1.12-3/data/keymaps/i386/qwerty/sv-latin1.map 2004-02-26 22:39:54.000000000 +0100 @@ -927,18 +916,6 @@ diff -Nur kbd-1.12-2/data/keymaps/i386/qwertz/sk-prog-qwertz.map kbd-1.12-3/data keycode 26 = bracketleft braceleft bracketleft braceleft Escape VoidSymbol Escape VoidSymbol Meta_bracketleft Meta_bracketleft Meta_bracketleft Meta_bracketleft keycode 27 = bracketright braceright bracketright braceright Control_bracketright VoidSymbol Control_bracketright VoidSymbol Meta_bracketright Meta_bracketright Meta_bracketright Meta_bracketright keycode 28 = Return -diff -Nur kbd-1.12-2/data/keymaps/i386/qwertz/sk-qwertz.map kbd-1.12-3/data/keymaps/i386/qwertz/sk-qwertz.map ---- kbd-1.12-2/data/keymaps/i386/qwertz/sk-qwertz.map 2004-02-26 22:36:34.000000000 +0100 -+++ kbd-1.12-3/data/keymaps/i386/qwertz/sk-qwertz.map 2004-02-26 22:39:54.000000000 +0100 -@@ -41,7 +41,7 @@ - keycode 12 = minus underscore equal percent Control_underscore Control_underscore Control_underscore Control_underscore Meta_minus Meta_minus Meta_minus Meta_minus - keycode 13 = equal plus dead_acute dead_circumflex VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_equal Meta_equal Meta_equal Meta_equal - keycode 14 = Delete Delete Delete Delete VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Delete Meta_Delete Meta_Delete Meta_Delete --keycode 15 = Tab Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab -+keycode 15 = Tab Meta_Tab Tab Tab VoidSymbol VoidSymbol VoidSymbol VoidSymbol Meta_Tab Meta_Tab Meta_Tab Meta_Tab - keycode 26 = bracketleft braceleft uacute slash Escape VoidSymbol Escape VoidSymbol Meta_bracketleft Meta_bracketleft Meta_bracketleft Meta_bracketleft - keycode 27 = bracketright braceright adiaeresis parenleft Control_bracketright VoidSymbol Control_bracketright VoidSymbol Meta_bracketright Meta_bracketright Meta_bracketright Meta_bracketright - keycode 28 = Return diff -Nur kbd-1.12-2/data/keymaps/mac/include/mac-linux-keys-bare.inc kbd-1.12-3/data/keymaps/mac/include/mac-linux-keys-bare.inc --- kbd-1.12-2/data/keymaps/mac/include/mac-linux-keys-bare.inc 2004-02-26 22:36:33.000000000 +0100 +++ kbd-1.12-3/data/keymaps/mac/include/mac-linux-keys-bare.inc 2004-02-26 22:39:54.000000000 +0100 diff --git a/kbd-1.12-prtscr_no_sigquit.diff b/kbd-1.12-prtscr_no_sigquit.diff index aeedc96..addf5a3 100644 --- a/kbd-1.12-prtscr_no_sigquit.diff +++ b/kbd-1.12-prtscr_no_sigquit.diff @@ -272,14 +272,3 @@ diff -ur kbd-1.12-0/data/keymaps/i386/qwertz/sk-prog-qwertz.map kbd-1.12-1/data/ keycode 102 = Find keycode 103 = Up keycode 104 = Prior -diff -ur kbd-1.12-0/data/keymaps/i386/qwertz/sk-qwertz.map kbd-1.12-1/data/keymaps/i386/qwertz/sk-qwertz.map ---- kbd-1.12-0/data/keymaps/i386/qwertz/sk-qwertz.map 2002-10-13 01:56:48.000000000 +0200 -+++ kbd-1.12-1/data/keymaps/i386/qwertz/sk-qwertz.map 2004-02-27 19:04:47.000000000 +0100 -@@ -123,6 +123,7 @@ - alt keycode 99 = Control_backslash - keycode 100 = AltGr - keycode 101 = Break -+ control keycode 101 = Control_c - keycode 102 = Find - keycode 103 = Up - keycode 104 = Prior diff --git a/kbd.changes b/kbd.changes index 25cc35e..0d1e4ef 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 3 20:49:23 CET 2007 - jw@suse.de + +- fixed bugzilla #153179 by adding new versions of sk-qwertz.map + and sk-qwerty.map from lmichnovic to suse-add.tar.bz2 +- Thus partially obsoleting kbd-1.12-prtscr_no_sigquit.diff and + kbd-1.12-Meta-Tab.diff + ------------------------------------------------------------------- Tue Aug 21 19:53:59 CEST 2007 - jw@suse.de diff --git a/kbd.init b/kbd.init index c9fe314..89f9582 100644 --- a/kbd.init +++ b/kbd.init @@ -438,7 +438,10 @@ case "$1" in then dumpkeys=no fi + if test "$dumpkeys" = "yes" ; then + # FIXME: this should be done much earlier + # to avoid bugzilla# 259694 or similar. ( dumpkeys > /etc/defkeymap.map ) > /dev/null 2>&1 if test ! -z "$KEYMAP" && test "$KEYMAP" != "/etc/defkeymap.map" ; then test ! -e "$KEYMAP" && KEYMAP=$K diff --git a/kbd.spec b/kbd.spec index 40ab460..54f5431 100644 --- a/kbd.spec +++ b/kbd.spec @@ -11,12 +11,12 @@ # norootforbuild Name: kbd -URL: ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd +Url: ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd License: GPL v2 or later Group: System/Console -Autoreqprov: on +AutoReqProv: on Version: 1.12 -Release: 132 +Release: 147 Summary: Keyboard and Font Utilities Source: ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/%{name}-%{version}.tar.bz2 Source1: kbd_fonts.tar.bz2 @@ -77,6 +77,7 @@ Authors: %define kbdrate_in_util %(rpm -ql util 2>/dev/null | grep -s /sbin/kbdrate && echo "1" || echo "0"; exit 0) %define kbd /usr/share/kbd + %prep %if %{kbdrate_in_util} echo "kbdrate is in util" @@ -322,6 +323,11 @@ rm -rf $RPM_BUILD_ROOT #rm -rf $RPM_BUILD_DIR/kbd-%{version} %changelog +* Mon Dec 03 2007 - jw@suse.de +- fixed bugzilla #153179 by adding new versions of sk-qwertz.map + and sk-qwerty.map from lmichnovic to suse-add.tar.bz2 +- Thus partially obsoleting kbd-1.12-prtscr_no_sigquit.diff and + kbd-1.12-Meta-Tab.diff * Tue Aug 21 2007 - jw@suse.de - cleaned up setfont according to bugzilla #302010 * Thu Aug 16 2007 - jw@suse.de diff --git a/suse-add.tar.bz2 b/suse-add.tar.bz2 index e9c1c91..897d05b 100644 --- a/suse-add.tar.bz2 +++ b/suse-add.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eed6b420fbce4597ff04de14292db3f35f101721008b3be6368c47209c97efb4 -size 35498 +oid sha256:64fddb55070c1fc286e945988bd11969532363e72babb553fbe0d87fb63c3183 +size 37070