commit xkeyboard-config for openSUSE:Factory
Hello community, here is the log from the commit of package xkeyboard-config for openSUSE:Factory checked in at Mon Feb 7 22:12:11 CET 2011. -------- --- xkeyboard-config/xkeyboard-config.changes 2010-09-29 03:39:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/xkeyboard-config/xkeyboard-config.changes 2011-02-05 13:32:40.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Feb 5 12:28:55 UTC 2011 - sndirsch@novell.com + +- xkeyboard-config 2.1 + * Again, some tweaks and additions, here and there. Updated 12 + translations, thanks to TP. +- refreshed patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xkeyboard-config-2.0.tar.bz2 New: ---- xkeyboard-config-2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.eJOS45/_old 2011-02-07 22:11:45.000000000 +0100 +++ /var/tmp/diff_new_pack.eJOS45/_new 2011-02-07 22:11:45.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xkeyboard-config (Version 2.0 ) +# spec file for package xkeyboard-config # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm AutoReqProv: on -Version: 2.0 +Version: 2.1 Release: 1 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 ++++++ MDSW-change-keycode.diff ++++++ --- /var/tmp/diff_new_pack.eJOS45/_old 2011-02-07 22:11:45.000000000 +0100 +++ /var/tmp/diff_new_pack.eJOS45/_new 2011-02-07 22:11:45.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- keycodes/xfree86.orig +++ keycodes/xfree86 -@@ -301,6 +301,9 @@ xkb_keycodes "basic" { +@@ -302,6 +302,9 @@ xkb_keycodes "basic" { // MacBooks generate 0x65 for the lower brightness key <II65> = 101; @@ -12,7 +12,7 @@ // Codes generated for scancodes 0x59-0x5f, 0x62-0x76 <K59> = 157; // <I1D> <K5A> = 170; // <I2A> -@@ -355,7 +358,7 @@ xkb_keycodes "basic" { +@@ -360,7 +363,7 @@ xkb_keycodes "basic" { // Other codes never generated. The XFree86 ddx never generates // these codes. // Thus we can use them as fake keys @@ -25,7 +25,7 @@ =================================================================== --- symbols/inet.orig +++ symbols/inet -@@ -1195,7 +1195,7 @@ xkb_symbols "logitech_g15" { +@@ -1214,7 +1214,7 @@ xkb_symbols "logitech_g15" { key <K72> { [ XF86LaunchC ] }; key <K74> { [ XF86WWW ] }; key <K75> { [ XF86LaunchE ] }; @@ -34,7 +34,7 @@ key <NFER> { [ XF86Launch2 ] }; key <XFER> { [ XF86Launch8 ] }; }; -@@ -1732,7 +1732,7 @@ xkb_symbols "apple" { +@@ -1751,7 +1751,7 @@ xkb_symbols "apple" { key <K5E> { [ F14 ] }; key <K5F> { [ F15 ] }; key <K6C> { [ XF86Eject ] }; ++++++ disable-2xalt_2xctrl-toggle.diff ++++++ --- /var/tmp/diff_new_pack.eJOS45/_old 2011-02-07 22:11:45.000000000 +0100 +++ /var/tmp/diff_new_pack.eJOS45/_new 2011-02-07 22:11:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xkeyboard-config-1.5/rules/base.xml.in +Index: xkeyboard-config-2.1/rules/base.xml.in =================================================================== ---- xkeyboard-config-1.5.orig/rules/base.xml.in -+++ xkeyboard-config-1.5/rules/base.xml.in -@@ -4132,6 +4132,7 @@ +--- xkeyboard-config-2.1.orig/rules/base.xml.in ++++ xkeyboard-config-2.1/rules/base.xml.in +@@ -4713,6 +4713,7 @@ <_description>Right Alt (while pressed) </configItem> </option> @@ -10,7 +10,7 @@ <option> <configItem> <name>grp:lswitch</name> -@@ -4144,6 +4145,7 @@ +@@ -4725,6 +4726,7 @@ <_description>Left Win (while pressed) </configItem> </option> ++++++ ibm_space_saver.diff ++++++ --- /var/tmp/diff_new_pack.eJOS45/_old 2011-02-07 22:11:45.000000000 +0100 +++ /var/tmp/diff_new_pack.eJOS45/_new 2011-02-07 22:11:45.000000000 +0100 @@ -1,5 +1,7 @@ ---- rules/base.lists.part.orig 2010-09-04 18:41:55.000000000 +0200 -+++ rules/base.lists.part 2010-09-04 19:04:39.000000000 +0200 +Index: rules/base.lists.part +=================================================================== +--- rules/base.lists.part.orig ++++ rules/base.lists.part @@ -73,6 +73,8 @@ toshiba_s3000 trust trustda \ unitekkb1925 yahoo @@ -9,6 +11,8 @@ // all layouts with 3rd and 4th groups ! $threelevellayouts = al az \ be br bt \ +Index: rules/base.m_s.part +=================================================================== --- rules/base.m_s.part.orig +++ rules/base.m_s.part @@ -1,4 +1,5 @@ @@ -17,9 +21,11 @@ a4techKBS8 = +inet(media_nav_acpi_common) a4_rfkb23 = +inet(media_nav_acpi_common) asus_laptop = +inet(media_common) +Index: rules/base.xml.in +=================================================================== --- rules/base.xml.in.orig +++ rules/base.xml.in -@@ -995,6 +995,12 @@ +@@ -1051,6 +1051,12 @@ </model> <model> <configItem> @@ -32,9 +38,11 @@ <name>macintosh</name> <_description>Macintosh <vendor>Apple</vendor> +Index: symbols/group +=================================================================== --- symbols/group.orig +++ symbols/group -@@ -323,6 +323,11 @@ xkb_symbols "rctrl_toggle" { +@@ -352,6 +352,11 @@ xkb_symbols "rctrl_toggle" { }; }; ++++++ microsoftnek4k-symbols.diff ++++++ --- /var/tmp/diff_new_pack.eJOS45/_old 2011-02-07 22:11:45.000000000 +0100 +++ /var/tmp/diff_new_pack.eJOS45/_new 2011-02-07 22:11:45.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- symbols/inet.orig +++ symbols/inet -@@ -1391,37 +1391,39 @@ xkb_symbols "microsoftmult" { +@@ -1410,37 +1410,39 @@ xkb_symbols "microsoftmult" { // Microsoft Natural Ergonomic Keyboard 4000 partial alphanumeric_keys xkb_symbols "microsoftnek4k" { ++++++ microsoftnek4k.diff ++++++ --- /var/tmp/diff_new_pack.eJOS45/_old 2011-02-07 22:11:45.000000000 +0100 +++ /var/tmp/diff_new_pack.eJOS45/_new 2011-02-07 22:11:45.000000000 +0100 @@ -1,3 +1,5 @@ +Index: geometry/microsoft +=================================================================== --- geometry/microsoft.orig +++ geometry/microsoft @@ -533,3 +533,43 @@ xkb_geometry "elite" { @@ -44,9 +46,11 @@ + { [ 2, 1], [ 24, 1 ], [ 24, 26 ], [ 2, 24 ] } + }; +}; +Index: keycodes/Makefile.am +=================================================================== --- keycodes/Makefile.am.orig +++ keycodes/Makefile.am -@@ -11,6 +11,7 @@ fujitsu \ +@@ -12,6 +12,7 @@ fujitsu \ hp \ ibm \ macintosh \ @@ -54,6 +58,8 @@ sony \ sun \ xfree86 \ +Index: keycodes/nek4k +=================================================================== --- /dev/null +++ keycodes/nek4k @@ -0,0 +1,45 @@ @@ -102,9 +108,11 @@ + <SAVE> = 242; +alias <PRNT> = <ONE>; +}; +Index: rules/base.xml.in +=================================================================== --- rules/base.xml.in.orig +++ rules/base.xml.in -@@ -862,6 +862,13 @@ +@@ -869,6 +869,13 @@ </model> <model> <configItem> @@ -118,9 +126,11 @@ <name>oretec</name> <_description>Ortek MCK-800 MM/Internet keyboard <vendor>Ortek</vendor> +Index: symbols/inet +=================================================================== --- symbols/inet.orig +++ symbols/inet -@@ -1388,6 +1388,42 @@ xkb_symbols "microsoftmult" { +@@ -1407,6 +1407,42 @@ xkb_symbols "microsoftmult" { }; @@ -163,9 +173,11 @@ // Oretec // Oretec MCK-800 MM/Internet keyboard +Index: keycodes/Makefile.in +=================================================================== --- keycodes/Makefile.in.orig +++ keycodes/Makefile.in -@@ -210,6 +210,7 @@ fujitsu \ +@@ -238,6 +238,7 @@ fujitsu \ hp \ ibm \ macintosh \ @@ -173,9 +185,11 @@ sony \ sun \ xfree86 \ ---- rules/base.lists.part.orig 2009-11-17 11:24:35.000000000 +0100 -+++ rules/base.lists.part 2009-11-17 11:26:07.000000000 +0100 -@@ -56,6 +56,7 @@ +Index: rules/base.lists.part +=================================================================== +--- rules/base.lists.part.orig ++++ rules/base.lists.part +@@ -60,6 +60,7 @@ logidinovo logidinovoedge \ microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ microsoftoffice microsoftmult \ @@ -183,8 +197,10 @@ mx1998 mx2500 mx2750 \ oretec \ pc105 \ ---- rules/base.m_g.part.orig 2009-08-15 16:31:43.000000000 +0200 -+++ rules/base.m_g.part 2009-11-17 11:26:51.000000000 +0100 +Index: rules/base.m_g.part +=================================================================== +--- rules/base.m_g.part.orig ++++ rules/base.m_g.part @@ -1,5 +1,6 @@ microsoftelite = microsoft(elite) $msmodels = microsoft(natural) @@ -192,8 +208,10 @@ dell101 = dell(dell101) dellm65 = dell(dellm65) latitude = dell(latitude) ---- rules/base.m_k.part.orig 2010-04-23 20:00:45.000000000 +0200 -+++ rules/base.m_k.part 2010-09-04 19:09:14.000000000 +0200 +Index: rules/base.m_k.part +=================================================================== +--- rules/base.m_k.part.orig ++++ rules/base.m_k.part @@ -6,6 +6,7 @@ sun6 = sun(type6_usb) sun6euro = sun(type6tuv_usb) ++++++ p_suse.diff ++++++ --- /var/tmp/diff_new_pack.eJOS45/_old 2011-02-07 22:11:45.000000000 +0100 +++ /var/tmp/diff_new_pack.eJOS45/_new 2011-02-07 22:11:45.000000000 +0100 @@ -1,6 +1,8 @@ ---- symbols/pc.orig 2009-11-17 11:01:28.000000000 +0100 -+++ symbols/pc 2010-09-04 18:59:28.000000000 +0200 -@@ -34,9 +34,9 @@ +Index: symbols/pc +=================================================================== +--- symbols/pc.orig ++++ symbols/pc +@@ -34,9 +34,9 @@ xkb_symbols "pc105" { key <LWIN> { [ Super_L ] }; key <RTSH> { [ Shift_R ] }; ++++++ xkeyboard-config-2.0.tar.bz2 -> xkeyboard-config-2.1.tar.bz2 ++++++ ++++ 49211 lines of diff (skipped) ++++++ xkeyboard-config.ctrl_alt_bksp.patch ++++++ --- /var/tmp/diff_new_pack.eJOS45/_old 2011-02-07 22:11:46.000000000 +0100 +++ /var/tmp/diff_new_pack.eJOS45/_new 2011-02-07 22:11:46.000000000 +0100 @@ -1,5 +1,7 @@ ---- xkeyboard-config-1.9/rules/evdev.m_s.part.orig 2010-04-23 20:00:46.000000000 +0200 -+++ xkeyboard-config-1.9/rules/evdev.m_s.part 2010-09-04 19:17:20.000000000 +0200 +Index: xkeyboard-config-2.1/rules/evdev.m_s.part +=================================================================== +--- xkeyboard-config-2.1.orig/rules/evdev.m_s.part ++++ xkeyboard-config-2.1/rules/evdev.m_s.part @@ -1,3 +1,3 @@ - $evdevkbds = +inet(evdev)+inet(%m) - applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) ++++++ xkeyboard-config.inet.microsoftpro.patch ++++++ --- /var/tmp/diff_new_pack.eJOS45/_old 2011-02-07 22:11:46.000000000 +0100 +++ /var/tmp/diff_new_pack.eJOS45/_new 2011-02-07 22:11:46.000000000 +0100 @@ -1,12 +1,14 @@ ---- rules/base.o_s.part.orig 2010-09-04 18:41:55.000000000 +0200 -+++ rules/base.o_s.part 2010-09-04 19:13:27.000000000 +0200 -@@ -109,6 +109,9 @@ +Index: rules/base.o_s.part +=================================================================== +--- rules/base.o_s.part.orig ++++ rules/base.o_s.part +@@ -112,6 +112,9 @@ esperanto:qwerty = +epo(qwerty) esperanto:dvorak = +epo(dvorak) terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) -+ inet:microsoftpro = +inet(microsoftprousb) -+ inet:media_common = +inet(media_common) -+ inet:nav_common = +inet(nav_common) ++ inet:microsoftpro = +inet(microsoftprousb) ++ inet:media_common = +inet(media_common) ++ inet:nav_common = +inet(nav_common) + keypad:pointerkeys = +keypad(pointerkeys) apple:alupckeys = +macintosh_vndr/apple(alupckeys) shift:both_capslock = +shift(both_capslock) - shift:lshift_both_capslock = +shift(lshift_both_capslock) ++++++ xkeyboard-config.inet.patch ++++++ --- /var/tmp/diff_new_pack.eJOS45/_old 2011-02-07 22:11:46.000000000 +0100 +++ /var/tmp/diff_new_pack.eJOS45/_new 2011-02-07 22:11:46.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- symbols/inet.orig +++ symbols/inet -@@ -1689,6 +1689,7 @@ xkb_symbols "apple" { +@@ -1708,6 +1708,7 @@ xkb_symbols "apple" { key <I58> { [ XF86Launch1 ] }; key <I59> { [ XF86Launch2 ] }; key <I5E> { [ XF86PowerOff ] }; ++++++ xkeyboard-config.macintosh.patch ++++++ --- /var/tmp/diff_new_pack.eJOS45/_old 2011-02-07 22:11:46.000000000 +0100 +++ /var/tmp/diff_new_pack.eJOS45/_new 2011-02-07 22:11:46.000000000 +0100 @@ -4,8 +4,10 @@ alt+e gives euro, alt+l gives @, etc ================================================================================ ---- rules/base.ml_s.part.orig 2010-04-23 20:00:45.000000000 +0200 -+++ rules/base.ml_s.part 2010-09-04 18:53:45.000000000 +0200 +Index: rules/base.ml_s.part +=================================================================== +--- rules/base.ml_s.part.orig ++++ rules/base.ml_s.part @@ -28,7 +28,7 @@ $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v) $applealu * = macintosh_vndr/apple(alukbd)+%l%(v) @@ -15,8 +17,10 @@ nokiarx44 * = nokia_vndr/rx-44(%l) nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l%_v) ---- rules/base.ml1_s.part.orig 2010-04-23 20:00:45.000000000 +0200 -+++ rules/base.ml1_s.part 2010-09-04 18:54:19.000000000 +0200 +Index: rules/base.ml1_s.part +=================================================================== +--- rules/base.ml1_s.part.orig ++++ rules/base.ml1_s.part @@ -8,7 +8,7 @@ applealu_jis us = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac) $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de