Bug#497341: patch to README.debian
On Mon, Oct 27, 2008, Neskie Manuel wrote: diff --git a/debian/README.Debian b/debian/README.Debian index 43f2b95..ea86b6f 100644 --- a/debian/README.Debian +++ b/debian/README.Debian Thanks! -- Mohammed Adnène Trojette -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#461074: More info
On Wed, Jan 16, 2008, André Luís Lopes wrote: So, it seems it was really something in 1.1~cvs.20080104.1-1 which broke it for me. I'm not sure what was it, but I would guess it could be the fix for #444035. Hi, the fix for #444035 has been reverted. Does the problem still occurs with 1.3-2? If so, could you send us your xorg.conf, the output of setxkbmap -print and xmodmap -pk? -- Mohammed Adnène Trojette -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#463373: xkb-data: Patch resolving the issue
On Thu, May 01, 2008, Itaï BEN YAACOV wrote: I attach a patch with which alts_toggle works again. Please could you have a look at http://bugs.freedesktop.org/show_bug.cgi?id=16164 and comment on it? (trying the patch there) -- Mohammed Adnène Trojette -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xkb-data: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 67a7c35116fbbb3e9b70ae7b98fdb443ed75fe97 Author: Sergey V. Udaltsov [EMAIL PROTECTED] Date: Sun Jun 1 00:46:41 2008 +0100 added model thinkpadz60, b.fd.o#16677 commit 45c2987c2e74fcc158632bb9aafbb2866dcedb46 Author: Sergey V. Udaltsov [EMAIL PROTECTED] Date: Sun Jun 1 00:23:37 2008 +0100 added microsoft7000, b.fd.o#16087 commit 4f53284ad6ffcc6d3f14d13837b3d5dc55de630c Author: Sergey V. Udaltsov [EMAIL PROTECTED] Date: Sat May 31 22:13:08 2008 +0100 fixed utf8 commit a4532365e7d926b6801f4297cf4e4651eea09125 Author: Sergey V. Udaltsov [EMAIL PROTECTED] Date: Sat May 31 00:40:59 2008 +0100 fixed some includes to winkeys commit 749987279d24b38ace4225c09512a8afce0c1905 Author: Sergey V. Udaltsov [EMAIL PROTECTED] Date: Sat May 31 00:09:58 2008 +0100 added ca(kut), b.fd.o#16408 commit 89664970667ae48177616938d26975a3f96d8289 Author: svu svu Date: Tue May 27 23:23:18 2008 + fixed unicode in name commit 7a6b7562a5131d2829f120adb28db0d25f74d74a Author: svu svu Date: Tue May 27 23:11:39 2008 + preparing 1.3 commit 3e1e79b6eba191553afc91c16cb3a271d5318e67 Author: svu svu Date: Tue May 27 23:07:42 2008 + fixes after reordered russian variants commit 7a5673e4b201c92d3db95071b67bfdfc2ad9e781 Author: svu svu Date: Tue May 27 22:51:58 2008 + fixes after reordered russian variants commit e132ba5141fa70800bb962f6d47d636918500210 Author: svu svu Date: Tue May 27 22:36:22 2008 + sync with TP commit 365f2c50601e257f50599062d32623187bc83184 Author: svu svu Date: Tue May 27 22:05:02 2008 + returned nbsp on 3rd level, b.fd.o#12764 commit f30f8d513071148f82f3fad90ec8291a566717f3 Author: svu svu Date: Tue May 27 22:05:02 2008 + returned nbsp on 3rd level, b.fd.o#12764 commit 48a218e94d982202a265cc218e9647837d278e53 Author: svu svu Date: Tue May 27 21:50:32 2008 + fixed one-handed dvorak variants, b.fd.o#5659 commit 54d4e123d33fdf929b9257c8cf77299dbfb51c26 Author: svu svu Date: Tue May 27 21:46:40 2008 + fixed nx9020 model, b.fd.o#7310 commit b478dad06b1007dae3148ed8dc83ed780e942285 Author: svu svu Date: Mon May 12 20:43:21 2008 + Changing the default Romanian variant, b.fd.o#13277 commit a3e281ddca7bf80da7612a46406a72388c2d8b3a Author: svu svu Date: Fri May 9 23:35:12 2008 + small fix for ua commit 71f80921d0c9a2ed5c30761fccbe80cb5cac9537 Author: svu svu Date: Fri May 9 23:31:36 2008 + default variant for ru is winkeys, for compatibility sake commit 3b07f382f7eb151134a9fec90a98d5bad52fb6fc Author: svu svu Date: Thu May 1 22:45:05 2008 + no more sun/sgi rules commit 8330e4ee760f55e85cce8f0e836240da884f086d Author: svu svu Date: Wed Apr 30 21:29:08 2008 + added us(dvp), b.fd.o#15727 commit 2ef8d09116105a011e13378a24150b96b7dfe153 Author: svu svu Date: Tue Apr 29 20:38:41 2008 + fixed ca(shs), b.fd.o#15756 commit 1bd31e41e5bff269d99f1c3db57ed768a5a26fce Author: svu svu Date: Wed Apr 23 19:36:58 2008 + reverted dead tilde, b.fd.o#12568 commit 0fb00efec7afe8f0bb31b58d98389fb774d35538 Author: svu svu Date: Wed Apr 23 18:12:14 2008 + return to ascii tilde, b.fd.o#9763 commit de8556d72e0a0ba8b15fd5b732d3421071209ea0 Author: svu svu Date: Tue Apr 22 22:12:12 2008 + returned nbsp on 4th level commit e7a8a95f074f9ad7386470da118871a7f0d96def Author: svu svu Date: Tue Apr 22 20:33:53 2008 + improved description commit f0f3763494a762b34250d41419334adcc668377c Author: svu svu Date: Tue Apr 22 20:03:26 2008 + dropping bad nbsp mapping, b.fd.o#12764 commit 2e8a4f8fbbbd4b3439438db9f0d0110f80446ece Author: svu svu Date: Tue Apr 22 19:54:10 2008 + options for nonbreakspace handling, b.fd.o#9529 commit 127fc5ef25a119bf7e62cdc881a700f10534a41f Author: svu svu Date: Mon Apr 21 12:30:16 2008 + fixed ISO for Swiss german commit ffb490449eb931f3d7e57c39634fb21bc9f5680c Author: svu svu Date: Sat Apr 19 22:36:45 2008 + changed default russian layout, put a lot of info abount languages/countries into base.xmml commit 0dca7981d031a1a7ca8891cdc5e352bef67d Author: svu svu Date: Sat Apr 12 00:24:52 2008 + fixed it(geo), b.fd.o#15058 commit 1902b69b09b44555a05c9f8c9b3cb6b231433709 Author: svu svu Date: Mon Apr 7 21:28:15 2008 + added group(shift_caps_switch), b.fd.o#15383 commit b0e516b26558e3f39cbd10b1bfd0b283e0dc5850 Author: svu svu Date: Tue Apr 1 21:23:40 2008 + added gb(colemak), b.fd.o#15303 commit 0ff4af836652d6b256716865d352bfd89423e520 Author: svu svu Date: Sun Mar 30 18:15:45 2008 + added ua(homophonic), b.fd.o#15240 commit afda4614ef2737a32d3ad4c8599339547074b7bc Author: svu svu Date: Sun Mar 30 17:07:44 2008 + fixing unicode codes, b.fd.o#15273 commit b6186201cde6d807cf985ec9cec320032da43096 Author: svu
xkb-data: Changes to 'debian-unstable'
ChangeLog | 30 Makefile.in| 18 NEWS |1 aclocal.m4 |3 compat/Makefile.in | 12 compat/compat.dir | 37 compat/complete|2 compat/default |2 compat/level5 |2 config.guess | 601 ++--- config.sub | 145 - configure | 127 - configure.in |2 debian/changelog | 11 debian/patches/add_void_definition_pl-324647.diff |4 debian/patches/clean.diff | 12 debian/patches/docs.diff |6 debian/patches/mac_poweroff.diff |6 debian/patches/resync_rules_base.diff | 574 - debian/patches/sclk_toggle.diff| 12 debian/patches/send-upstream/001_keypad_comma.diff |8 debian/patches/unhide_lv3_enter_switch.diff| 12 docs/Makefile.in | 12 geometry/Makefile.in | 12 geometry/digital_vndr/Makefile.in | 12 geometry/geometry.dir | 90 geometry/hhk |2 geometry/sgi_vndr/Makefile.in | 12 intltool-extract.in| 397 --- intltool-merge.in | 329 --- intltool-update.in | 223 -- keycodes/Makefile.in | 12 keycodes/digital_vndr/Makefile.in | 12 keycodes/keycodes.dir | 81 keycodes/sgi_vndr/Makefile.in | 12 keymap/Makefile.in | 12 keymap/digital_vndr/Makefile.in| 12 keymap/keymap.dir | 326 +-- keymap/sgi_vndr/Makefile.in| 12 keymap/sun_vndr/Makefile.in| 12 po/ChangeLog |4 po/POTFILES.in |1 po/cs.po | 1580 ++- po/nl.po | 1851 +- po/[EMAIL PROTECTED] | 2104 +++-- po/vi.po | 1694 +++- rules/Makefile.am |6 rules/Makefile.in | 18 rules/base | 75 rules/base.lst |4 rules/base.xml.in |8 rules/compat/Makefile.in | 12 rules/compat/base.l2_s.part|8 rules/compat/base.l2v2_s.part |7 rules/compat/base.l3_s.part|8 rules/compat/base.l3v3_s.part |7 rules/compat/base.l4_s.part|8 rules/compat/base.l4v4_s.part |7 rules/compat/base.ml1_s.part |8 rules/compat/base.ml1v1_s.part |7 rules/compat/base.ml_s.part|8 rules/compat/base.mlv_s.part |7 rules/compat/variantRename.lst |1 semantics/Makefile.in | 12 semantics/semantics.dir|4 symbols/Makefile.in| 12 symbols/ad |2 symbols/al |2 symbols/altwin |2 symbols/az |2 symbols/bd |2 symbols/be |2 symbols/bg |2 symbols/braille|2 symbols/bt |2 symbols/by |2 symbols/cd |2 symbols/ch |2 symbols/cn |2 symbols/ctrl |2 symbols/digital_vndr/Makefile.in | 12 symbols/epo
Bug#469306: xkb-data: rules/sun.lst missing
tag 469306 moreinfo
thanks
On Tue, Mar 04, 2008, Bernhard R. Link wrote:
When running setxkbmap on my sparc with type 5 keyboard (whose layout
seems broken by other things I am still investigating), trying to run
setxkbmap results in an error due to a missing sun.lst file:
execve(/usr/bin/setxkbmap, [setxkbmap], [/* 20 vars */]) = 0
[...]
readv(3, [{sun\0type5\0us\0\0\0, 15}, {\0, 1}], 2) = 16
open(./rules/sun-C.lst, O_RDONLY) = -1 ENOENT (No such file or
directory)
open(./rules/sun.lst, O_RDONLY) = -1 ENOENT (No such file or
directory)
open(/usr/share/X11/xkb/rules/sun-C.lst, O_RDONLY) = -1 ENOENT (No such
file or directory)
open(/usr/share/X11/xkb/rules/sun.lst, O_RDONLY) = -1 ENOENT (No such file
or directory)
write(2, Couldn\'t find rules file (sun) \n, 32 ) = 32
exit_group(-4) = ?
When I generate the file with the xml2lst.pl script from the source,
at least I get the same type of error as when starting the X server and
not about not finding a rules file.
Here is upstream's comment:
| --- Comment #1 From Sergey V. Udaltsov 2008-05-01 02:30:16 PST
---
|
| It is amazing - the file was deleted 3+ years ago, and only now someone
| noticed..;)
|
| Actually, I am going to remove rules/sun* altogether - because I was told by
| Sun people (namely, Alan Coopersmith) they are using rules/base* stuff
anyway.
| So would original author of the bug try switching to base ruleset?
--
Mohammed Adnène Trojette
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#480124: xkb-data: russian pc101 layout is broken after the upgrade.
On Mon, May 12, 2008, Stanislav Maslovski wrote:
I am a user of an old-style pc101 russian keyboard _without_ winkeys,
so I did not get the problem with switching layouts (because I never
had winkeys in my xorg.conf), however there is another problem:
the comma, colon, semicolon, question sign, etc. are all at the wrong
keys after this upgrade.
Hi, I think this bug has been fixed upstream.
Could you please apply this patch on /usr/share/X11/xkb/symbols/ru and
tell me if it fixes it?
Index: ru
===
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/ru,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ru 19 Apr 2008 22:36:45 - 1.21
+++ ru 9 May 2008 23:31:37 - 1.22
@@ -8,9 +8,9 @@
//
// $XFree86: xc/programs/xkbcomp/symbols/ru,v 1.3 2003/02/15 22:27:05 dawes
Exp $
-// Windows layout, former winkeys
+// Windows layout
partial default alphanumeric_keys
-xkb_symbols basic {
+xkb_symbols winkeys {
include ru(common)
name[Group1]= Russia;
--
Mohammed Adnène Trojette
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#469335: xkb-data: sun rules reference nonexistent symbols
On Tue, Mar 04, 2008, Bernhard R. Link wrote: With the following patch the error is gone (I guess it still needs modification to all the not-us files in symbols, as they seem to reference sun5 instead of type5, too. The keyboard mapping is also different (though my Sun type 5c keyboard produce very absurd keys with it still, though they seem to be the same as with the xkb-data-legacy package now) Here is upstream's answer to the bug: | Next release is going to see rules/sun* dropped. Confirmed with Sun | people - no need in that obsolete and unmaintained stuff. If you | really need those layouts - would you consider submitting patches to | rules/base* files? Is this OK with you? If so, the next upload shall close the bug. -- Mohammed Adnène Trojette -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#469335: xkb-data: sun rules reference nonexistent symbols
On Wed, May 07, 2008, Mohammed Adnène Trojette wrote: On Tue, Mar 04, 2008, Bernhard R. Link wrote: With the following patch the error is gone (I guess it still needs modification to all the not-us files in symbols, as they seem to reference sun5 instead of type5, too. The keyboard mapping is also different (though my Sun type 5c keyboard produce very absurd keys with it still, though they seem to be the same as with the xkb-data-legacy package now) Here is upstream's answer to the bug: | Next release is going to see rules/sun* dropped. Confirmed with Sun | people - no need in that obsolete and unmaintained stuff. If you | really need those layouts - would you consider submitting patches to | rules/base* files? Is this OK with you? If so, the next upload shall close the bug. Hmm, as Julien is pointing out on IRC, maybe the patch against rules/base still applies? -- Mohammed Adnène Trojette -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#477197: setting package to xkeyboard-config xkb-data, tagging 477197
# Automatically generated email from bts, devscripts version 2.10.26 # # xkeyboard-config (1.1~cvs.20080501-1) unstable; urgency=low # # * New upstream CVS snapshot from May 1st 2008: # + revert Latin American layout. (Closes: #477197) # package xkeyboard-config xkb-data tags 477197 + pending -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#460838: Please don't ship rules/base in source
On Tue, Jan 15, 2008, Philippe Cloutier wrote: I don't really know how rules/base works, but it seems to be autogenerated and possible not to ship it in the source. I see that even upstream tarballs contain it, but maybe the Debian patch could just remove it. The reason I ask this is that having this file seems to cause problems when trying to modify rules. Apparently if I build the package, then edit the source code and finally build and retry cleaning, cleaning fails because rules/base is updated so unpatching fails: Le patch add_void_definition_pl-324647.diff ne se retire pas proprement (rafraichissez le, ou forcez avec -f) The problem is the order of the patch application. I've changed that. However, I don't currently intend to remove the file (note that a script of regeneration is present as a comment to the debian/patches/resync_rules_base.diff. That's what I use to keep the rules/base file up-to-date with Debian's patches. -- Mohammed Adnène Trojette -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#460550: setting package to xkeyboard-config xkb-data, tagging 460550, tagging 461489, tagging 460838 ...
# Automatically generated email from bts, devscripts version 2.10.26 # # xkeyboard-config (1.2~cvs.20080501.1-1) unstable; urgency=low # # * New upstream CVS snapshot from May 1st 2008: # + revert Latin American layout. (Closes: #477197) # + reactivate right control key in fr(oss). (Closes: #460550) # + fix olpc variants in the Afghan layout. (Closes: #461521) # * Clean up add_void_definition_pl-324647.diff and apply it before #resync_rules_base.diff to avoid unclean patch applying and #unapplying. (Closes: #460838) # * Document issues with the Fn key on some laptops in #README.Debian. (Closes: #461489) # package xkeyboard-config xkb-data tags 460550 + pending tags 461489 + pending tags 460838 + pending tags 461521 + pending -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#469826: xkb-data: Outdated French Dvorak keymap (bépo)
On Sat, Mar 22, 2008, Roland Mas wrote:
There's an even newer upstream version now, 0.6.5.1, with even more
non-cosmetic changes (two more letter pairs, R/N and F/J, were
swapped). From a discussion I had with upstream on IRC, it seems the
layout is approaching stabilisation, so it would be a shame to ship an
old version in Lenny.
Is the attached patch OK for you?
Cc-ing Joss as his name is quoted as related to the legacy dvorak
layout.
--
Mohammed Adnène Trojette
--- symbols/fr 2008-05-01 00:20:50.0 +0200
+++ /tmp/fr.new 2008-05-01 03:22:09.0 +0200
@@ -440,22 +440,22 @@
// │ s a│ s = normal, a = AltGr
// └┘
//
-// ┌─┬─┬─┬─┬─┬─┬─┬─┬─┬─┬─┬─┬─┲━┓
-// │ $ │ 1 ¹ │ 2 ² │ 3 ³ │ 4 ° │ 5 ˚ │ 6 │ 7 │ 8 │ 9 │ 0 │ ^ │ µ ┃ ⌫ Retour┃
-// │ @ # │ _ { │ } │ « │ » │ ( [ │ ) ] │ + ± │ - ¬ │ * × │ / ÷ │ = ¯ │ % ┃ arrière┃
-// ┢━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━┫
-// ┃ ┃ B │ É ˊ │ P ¶ │ O Œ │ È ` │ Ç │ V │ D Ð │ L │ F │ J │ Z ┃Entrée ┃
-// ┃Tab ↹ ┃ b | │ é │ p § │ o œ │ è ` │ ç │ v │ d ð │ l £ │ f ª │ j │ z ┃ ⏎ ┃
-// ┣━━━┻┱┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┺┓ ┃
-// ┃┃ A Æ │ U Ù │ I ˇ │ E │ ? │ C ¢ │ T Þ │ S │ N │ R │ M │ ! ┃ ┃
-// ┃Maj ⇬ ┃ a æ │ u ù │ i ̈ │ e € │ , ¿ │ c © │ t þ │ s ß │ n │ r ® │ m º │ ˆ ¡ ┃ ┃
-// ┣━━━┳┹┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┬┴┲┷━┻━━┫
-// ┃ ┃ ù │ À ˜ │ H │ Y │ : · │ K │ ; │ Q │ G │ X │ W ┃ ┃
-// ┃Shift ⇧┃ ê / │ à ~ │ h ! │ y ¥ │ . \ │ k │ ' │ q │ g │ x │ w ┃Shift ⇧ ┃
-// ┣━━━╋━┷━┳━━━┷━━━┱─┴─┴─┴─┴─┴─┴───┲━┷━╈━┻━┳━━━┳━━━┛
-// ┃ ┃ ┃ ┃ ⍽ Espace insécable ␣ ┃ ┃ ┃ ┃
-// ┃Ctrl ┃Meta ┃Alt┃ ␣ Espace␣ ┃AltGr ⇮┃Menu ┃Ctrl ┃
-// ┗━━━┻━━━┻━━━┹───┺━━━┻━━━┻━━━┛
+// ┌┬┬┬┬┬┬┬┬┬┬┬┬╔═╗
+// │ # ¶│ 1 │ 2 ≤│ 3 ≥│ 4 “│ 5 ”║ 6 │ 7 °│ 8 ′│ 9 ″│ 0 │ @ │ µ ║ ║
+// │ $ §│ —│ « │ » │ ( [│ ) ]║ _ │ + ±│ - –│ / ÷│ * ×│ = ¬│ % ‰║ -- ║
+// ╔╧══╗─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─╚══╦══╣
+// ║ |- ║ B ¦│ É ˝│ P │ O Œ│ È `║ ! ¡│ V │ D Ð│ L │ J IJ│ Z Ə│ W ║ | ║
+// ║ -| ║ b |│ é ´│ p │ o œ│ è `║ ˆ ˇ│ v │ d ð│ l /│ j ij│ z ə│ w ˘║ -' ║
+// ╠═══╩╗───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───╚╗ ║
+// ║║ A Æ│ U Ù│ I ˙│ E ¤│ ? ¿║ C │ T Þ│ S │ R │ N Ñ│ M º│ Ç ║ ║
+// ║ CAPS ║ a æ│ u ù│ i ¨│ e €│ , ’║ c ©│ t þ│ s ß│ r ®│ n ñ│ m ¯│ ç ¸║ ║
+// ╠══╦═╝──┬─┴──┬─┴──┬─┴─══─┴──┬─┴──┬─┴─══─┴──┬─┴──┬─┴──┬─┴──╔═╧╩═╣
+// ║ ^ ║ Ê │ À ˜│ Y │ H │ : ·│ K ║ ; │ Q │ G │ X ‡│ F ª║ ^ ║
+// ║ | ║ ê /│ à ~│ y \│ h {│ . }│ k …║ ' ‘│ q │ g °│ x †│ f ˛║ | ║
+// ╠══╩╦═══╧══╦═╧═══╦╧╧╧╧╧╧═╦══╧══╦═╧╬═╦══╣
+// ║ ║ ║ ║ NBSPACE FINE-NBSPACE ║ ║ ║ ║ ║
+// ║ Ctrl ║ WinG ║ Alt ║ SPACE ║AltGr║ WinD ║WinM ║ Ctrl ║
+// ╚═══╩══╩═╩═══╩═╩══╩═╩══╝
partial alphanumeric_keys
xkb_symbols bepo {
@@ -463,64 +463,60 @@
name[Group1]= France - Bepo, ergonomic, Dvorak way;
-// First row
-key TLDE { [ at, dollar, numbersign ] }; // @ $ #
-key AE01 { [ underscore,1, braceleft,onesuperior ] }; // _ 1 { ¹
-key AE02 { [quotedbl,2, braceright,twosuperior ] }; // 2 } ²
-key AE03 { [ guillemotleft,3, less, threesuperior ] }; // « 3 ³
-key AE04 { [ guillemotright,4,greater, degree ] }; // » 4 °
-key AE05 { [ parenleft,5,bracketleft, dead_abovering ] }; // ( 5 [ ˚
-key AE06 { [ parenright,6, bracketright ] }; // ) 6 ]
-key AE07 { [plus,7, plusminus ] }; // + 7 ±
-key AE08 { [ minus,8,notsign ] }; // - 8 ¬
-key AE09 { [asterisk,9, multiply ] }; // * 9 ×
-key AE10 { [ slash,0, division ] }; // / 0 ÷
-key AE11 { [ equal, asciicircum, macron ] }; // = ^ ¯
-key AE12 { [ percent, mu ] }; // % µ
-
-// Second row
-key AD01 { [ b,B,bar ] }; // b B |
-key AD02 { [ eacute, Eacute, ampersand
xkb-data: Changes to 'debian-unstable'
Trojette [EMAIL PROTECTED] Date: Thu May 1 03:08:28 2008 +0200 + reactivate right control key in fr(oss). (Closes: #460550) + fix olpc variants in the Afghan layout. (Closes: #461521) * Clean up add_void_definition_pl-324647.diff and apply it before resync_rules_base.diff to avoid unclean patch applying and unapplying. (Closes: #460838) + reactivate right control key in fr(oss). (Closes: #460550) + fix olpc variants in the Afghan layout. (Closes: #461521) * Clean up add_void_definition_pl-324647.diff and apply it before resync_rules_base.diff to avoid unclean patch applying and unapplying. (Closes: #460838) * Document issues with the Fn key on some laptops in README.Debian. (Closes: #461489) diff --git a/debian/README.Debian b/debian/README.Debian index 70ce8eb..43f2b95 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -90,3 +90,12 @@ example, insert the following lines (without the pipes): /etc/X11/xkb/base.xml is a configuration file. Mohammed Adnène Trojette [EMAIL PROTECTED] Sun, 23 Sep 2007 00:05:50 +0200 + +Your 'Fn' key is not working + + +On some laptops (Gateway MX6453 for instance), when X starts with +numlock on, the 'Fn' key is toggled the wrong way. Just turn numlock off +to get the 'Fn' key work again. + +Mohammed Adnène Trojette [EMAIL PROTECTED] Thu, 01 May 2008 02:36:13 +0200 diff --git a/debian/changelog b/debian/changelog index b8b0bc4..444aa31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,13 @@ xkeyboard-config (1.2~cvs.20080501.1-1) unstable; urgency=low * New upstream CVS snapshot from May 1st 2008: + revert Latin American layout. (Closes: #477197) - * Clean up add_void_definition_pl-324647.diff. + + reactivate right control key in fr(oss). (Closes: #460550) + + fix olpc variants in the Afghan layout. (Closes: #461521) + * Clean up add_void_definition_pl-324647.diff and apply it before +resync_rules_base.diff to avoid unclean patch applying and +unapplying. (Closes: #460838) + * Document issues with the Fn key on some laptops in +README.Debian. (Closes: #461489) -- Mohammed Adnène Trojette [EMAIL PROTECTED] Thu, 01 May 2008 01:29:51 +0200 commit 761539a4b8639cc33990db50cd843339e32a03ca Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Thu May 1 01:57:23 2008 +0200 Refresh patches diff --git a/debian/patches/resync_rules_base.diff b/debian/patches/resync_rules_base.diff index aaa0fb5..bf238cd 100644 --- a/debian/patches/resync_rules_base.diff +++ b/debian/patches/resync_rules_base.diff @@ -20,8 +20,8 @@ Index: xkb-data/rules/base === xkb-data.orig/rules/base 2008-05-01 01:52:42.0 +0200 -+++ xkb-data/rules/base2008-05-01 01:53:06.0 +0200 +--- xkb-data.orig/rules/base 2008-05-01 01:56:51.0 +0200 xkb-data/rules/base2008-05-01 01:57:01.0 +0200 @@ -165,6 +165,8 @@ * dvorak pl = pc+pl(dvorak_quotes) * dvorak pl_altquotes= pc+pl(dvorak_altquotes) @@ -316,8 +316,8 @@ Index: xkb-data/rules/base nbsp:level3 = +nbsp(level3) Index: xkb-data/rules/base.lst === xkb-data.orig/rules/base.lst 2008-05-01 01:52:43.0 +0200 -+++ xkb-data/rules/base.lst2008-05-01 01:53:08.0 +0200 +--- xkb-data.orig/rules/base.lst 2008-05-01 01:56:51.0 +0200 xkb-data/rules/base.lst2008-05-01 01:57:02.0 +0200 @@ -582,6 +582,7 @@ grp:rshift_toggleRight Shift key changes layout. grp:lctrl_toggle Left Ctrl key changes layout. @@ -344,8 +344,8 @@ Index: xkb-data/rules/base.lst keypad:legacy_wang Legacy Wang 724 keypad Index: xkb-data/rules/compat/base.l2_s.part === xkb-data.orig/rules/compat/base.l2_s.part 2008-05-01 01:52:43.0 +0200 -+++ xkb-data/rules/compat/base.l2_s.part 2008-05-01 01:53:06.0 +0200 +--- xkb-data.orig/rules/compat/base.l2_s.part 2008-05-01 01:56:51.0 +0200 xkb-data/rules/compat/base.l2_s.part 2008-05-01 01:57:00.0 +0200 @@ -1,6 +1,7 @@ ar = +ara%(v[2]):2 ben = +in(ben)%(v[2]):2 @@ -378,8 +378,8 @@ Index: xkb-data/rules/compat/base.l2_s.part sapmi(sefi) = +fi(smi):2 Index: xkb-data/rules/compat/base.l2v2_s.part === xkb-data.orig/rules/compat/base.l2v2_s.part2008-05-01 01:52:43.0 +0200 -+++ xkb-data/rules/compat/base.l2v2_s.part 2008-05-01 01:53:06.0 +0200 +--- xkb-data.orig/rules/compat/base.l2v2_s.part2008-05-01 01:56:51.0 +0200 xkb-data/rules/compat
Bug#477197: Dead ~
On Thu, Apr 24, 2008, Christian Perrier wrote: Quoting Amaya ([EMAIL PROTECTED]): Well, I was told upstream wanted to conduct a poll in this bug number. Was this never the case? Well, if that happened, nothing showed up in the bug report. I'm not sure that such a poll is very representative, indeed. Still, everybody made the very same point, actually..:-) Yesterday, after Amaya's message, I've forwarded the bug report. So you should find the link on the BTS. -- Mohammed Adnène Trojette
Bug#461489: Documentation is nearly useless here
On Wed, Feb 27, 2008, Ray Dillinger wrote: And the silence from Debian-bugs is very very depressing. Is anybody out there? Does anybody even have any questions about my system or configuration that I could answer just to give me the illusion that I'm contributing to a solution? You're contributing to a solution. I just did not have the time to check the issue. If you want, you can report the bug directly to upstream (http://bugs.freedesktop.org/ - xkeyboard-config component). -- Mohammed Adnène Trojette
xkb-data: Changes to 'debian-unstable'
debian/changelog |2 -
debian/xkb-data.postinst | 31
debian/xkb-data.preinst | 91 +++
3 files changed, 92 insertions(+), 32 deletions(-)
New commits:
commit bd3b08405526031c82d49566b9989aed7547c6f7
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sun Jan 13 15:30:43 2008 +0100
* Remove conffiles left in /etc/X11/xkb/ in preinst. (Closes: #366180)
diff --git a/debian/changelog b/debian/changelog
index 2fdf6a7..23b552d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,7 @@ xkeyboard-config (1.1~cvs.20080104.1-1) UNRELEASED;
urgency=low
made /usr/share/X11/xkb/rules/base.xml a symlink to
/etc/X11/xkb/base.xml.
(Closes: #410628, #410903, #438940)
- * Remove files left in /etc/X11/xkb/. (Closes: #366180)
+ * Remove conffiles left in /etc/X11/xkb/ in preinst. (Closes: #366180)
* New patch: add_void_definition_pl-324647.diff
+ don't use rules/latin's definitions for alt+{w,q,f}.
(Closes: #324647)
diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
deleted file mode 100644
index adb634d..000
--- a/debian/xkb-data.postinst
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# postinst script for xkb-data
-#
-
-set -e
-
-case $1 in
-configure)
-if [ -d /etc/X11/xkb/ -a `find /etc/X11/xkb/ | wc -l` -ne 1 ]
-then
- find /etc/X11/xkb/* -not -name base.xml* | xargs
--no-run-if-empty rm
-fi
-;;
-
-abort-upgrade|abort-remove|abort-deconfigure)
-;;
-
-*)
-echo postinst called with unknown argument \`$1' 2
-exit 1
-;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/xkb-data.preinst b/debian/xkb-data.preinst
new file mode 100644
index 000..19dfe47
--- /dev/null
+++ b/debian/xkb-data.preinst
@@ -0,0 +1,91 @@
+#!/bin/sh
+# preinst script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# Remove a no-longer used conffile
+rm_conffile() {
+PKGNAME=$1
+CONFFILE=$2
+
+if [ -e $CONFFILE ]; then
+md5sum=`md5sum \$CONFFILE\ | sed -e \s/ .*//\`
+old_md5sum=`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e
\' $CONFFILE'{s/ obsolete$//;s/.* //p}\`
+if [ $md5sum != $old_md5sum ]; then
+echo Obsolete conffile $CONFFILE has been modified by you.
+echo Saving as $CONFFILE.dpkg-bak ...
+mv -f $CONFFILE $CONFFILE.dpkg-bak
+else
+echo Removing obsolete conffile $CONFFILE ...
+rm -f $CONFFILE
+fi
+fi
+}
+
+case $1 in
+install|upgrade)
+if dpkg --compare-versions $2 le 0.8-3; then
+rm_conffile xkb-data /etc/X11/xkb/geometry/omnibook
+rm_conffile xkb-data /etc/X11/xkb/compat/group_led
+rm_conffile xkb-data /etc/X11/xkb/compat/leds
+rm_conffile xkb-data /etc/X11/xkb/rules/xfree86-it.lst
+rm_conffile xkb-data /etc/X11/xkb/symbols/ru_yawerty
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/ar
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/ben
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/cz_qwerty
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/dev
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/dvorak
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/el
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/en_US
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/fr-latin9
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/ge_la
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/ge_ru
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/guj
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/gur
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/il_phonetic
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/iu
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/kan
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/lo
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/mk
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/ml
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/mt_us
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/ogham
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/ori
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/pl2
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/sapmi
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/sk_qwerty
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/sr
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/syr
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/syr_phonetic
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/tel
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/th_pat
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/th_tis
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/tml
+rm_conffile xkb-data /etc/X11/xkb/symbols/pc/yu
+rm_conffile
xkb-data: Changes to 'debian-unstable'
debian/changelog |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2e36ee06ead39dcf2b5623f237109d4a47bf4c22
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sun Jan 13 15:34:56 2008 +0100
releasing version 1.1~cvs.20080104.1-1
diff --git a/debian/changelog b/debian/changelog
index 23b552d..cd0528b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xkeyboard-config (1.1~cvs.20080104.1-1) UNRELEASED; urgency=low
+xkeyboard-config (1.1~cvs.20080104.1-1) unstable; urgency=low
* New upstream CVS snapshot from January 4th 2008:
+ fixed Latin American layout. (Closes: #444035)
@@ -22,7 +22,7 @@ xkeyboard-config (1.1~cvs.20080104.1-1) UNRELEASED;
urgency=low
+ don't use rules/latin's definitions for alt+{w,q,f}.
(Closes: #324647)
- -- Mohammed Adnène Trojette [EMAIL PROTECTED] Fri, 04 Jan 2008 22:47:11
+0100
+ -- Mohammed Adnène Trojette [EMAIL PROTECTED] Sun, 13 Jan 2008 15:33:54
+0100
xkeyboard-config (1.0~cvs.20070916-1) unstable; urgency=low
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xkb-data: Changes to 'debian-unstable'
debian/README.Debian|7 +++
debian/changelog|3 +
debian/xkb-data.preinst | 91
3 files changed, 9 insertions(+), 92 deletions(-)
New commits:
commit 197b96cf24966623d748f32f6ac5510a51342deb
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sun Jan 13 17:14:48 2008 +0100
* Documented how to remove conffiles left in /etc/X11/xkb/ in
README.Debian. (Closes: #366180)
diff --git a/debian/README.Debian b/debian/README.Debian
index 7d74dfb..70ce8eb 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -47,6 +47,13 @@ in /etc/X11/xorg.conf can be replaced by
Denis Barbier [EMAIL PROTECTED] Thu, 5 Oct 2006 22:51:12 +0200
+Cleaning /etc/X11/xkb
+-
+
+Since 0.8-3, all the files in /etc/X11/xkb/ were moved to
+/usr/share/X11/xkb/symbols. If you want to clean /etc/X11/xkb/, you need
+to run dpkg -P xlibs.
+
Customised layouts
--
diff --git a/debian/changelog b/debian/changelog
index cd0528b..aaf3564 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,8 @@ xkeyboard-config (1.1~cvs.20080104.1-1) unstable; urgency=low
made /usr/share/X11/xkb/rules/base.xml a symlink to
/etc/X11/xkb/base.xml.
(Closes: #410628, #410903, #438940)
- * Remove conffiles left in /etc/X11/xkb/ in preinst. (Closes: #366180)
+ * Documented how to remove conffiles left in /etc/X11/xkb/ in
+README.Debian. (Closes: #366180)
* New patch: add_void_definition_pl-324647.diff
+ don't use rules/latin's definitions for alt+{w,q,f}.
(Closes: #324647)
diff --git a/debian/xkb-data.preinst b/debian/xkb-data.preinst
deleted file mode 100644
index ea49f48..000
--- a/debian/xkb-data.preinst
+++ /dev/null
@@ -1,442 +0,0 @@
-#!/bin/sh
-# preinst script for #PACKAGE#
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# Remove a no-longer used conffile
-rm_conffile() {
-PKGNAME=$1
-CONFFILE=$2
-
-if [ -e $CONFFILE ]; then
-md5sum=`md5sum \$CONFFILE\ | sed -e \s/ .*//\`
-old_md5sum=`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e
\' $CONFFILE'{s/ obsolete$//;s/.* //p}\`
-if [ $md5sum != $old_md5sum ]; then
-echo Obsolete conffile $CONFFILE has been modified by you.
-echo Saving as $CONFFILE.dpkg-bak ...
-mv -f $CONFFILE $CONFFILE.dpkg-bak
-else
-echo Removing obsolete conffile $CONFFILE ...
-rm -f $CONFFILE
-fi
-fi
-}
-
-case $1 in
-install|upgrade)
-if dpkg --compare-versions $2 ge 1.0~cvs.20070916-1; then
-
-
-rm_conffile xlibs /etc/X11/xkb/README.config
-rm_conffile xlibs /etc/X11/xkb/geometry.dir
-rm_conffile xlibs /etc/X11/xkb/rules/sgi
-rm_conffile xlibs /etc/X11/xkb/rules/sun
-rm_conffile xlibs /etc/X11/xkb/rules/xorg
-rm_conffile xlibs /etc/X11/xkb/rules/xorg.lst
-rm_conffile xlibs /etc/X11/xkb/rules/xorg.xml
-rm_conffile xlibs /etc/X11/xkb/rules/README
-rm_conffile xlibs /etc/X11/xkb/rules/xorg-it.lst
-rm_conffile xlibs /etc/X11/xkb/rules/sgi.lst
-rm_conffile xlibs /etc/X11/xkb/rules/sun.lst
-rm_conffile xlibs /etc/X11/xkb/types/pc
-rm_conffile xlibs /etc/X11/xkb/types/caps
-rm_conffile xlibs /etc/X11/xkb/types/default
-rm_conffile xlibs /etc/X11/xkb/types/mousekeys
-rm_conffile xlibs /etc/X11/xkb/types/basic
-rm_conffile xlibs /etc/X11/xkb/types/extra
-rm_conffile xlibs /etc/X11/xkb/types/README
-rm_conffile xlibs /etc/X11/xkb/types/complete
-rm_conffile xlibs /etc/X11/xkb/types/numpad
-rm_conffile xlibs /etc/X11/xkb/types/iso9995
-rm_conffile xlibs /etc/X11/xkb/README
-rm_conffile xlibs /etc/X11/xkb/compat.dir
-rm_conffile xlibs /etc/X11/xkb/semantics/default
-rm_conffile xlibs /etc/X11/xkb/semantics/basic
-rm_conffile xlibs /etc/X11/xkb/semantics/xtest
-rm_conffile xlibs /etc/X11/xkb/semantics/complete
-rm_conffile xlibs /etc/X11/xkb/keymap.dir
-rm_conffile xlibs /etc/X11/xkb/types.dir
-rm_conffile xlibs /etc/X11/xkb/geometry/hp
-rm_conffile xlibs /etc/X11/xkb/geometry/pc
-rm_conffile xlibs /etc/X11/xkb/geometry/ibm/thinkpad
-rm_conffile xlibs /etc/X11/xkb/geometry/nec
-rm_conffile xlibs /etc/X11/xkb/geometry/sgi/O2
-rm_conffile xlibs /etc/X11/xkb/geometry/sgi/indy
-rm_conffile xlibs /etc/X11/xkb/geometry/sgi/indigo
-rm_conffile xlibs /etc/X11/xkb/geometry/sun
-rm_conffile xlibs /etc/X11/xkb/geometry/dell
-rm_conffile xlibs /etc/X11/xkb/geometry/sony
-rm_conffile xlibs /etc/X11/xkb/geometry/digital/lk
-rm_conffile xlibs /etc/X11/xkb/geometry/digital/pc
-rm_conffile xlibs /etc/X11/xkb/geometry/digital/unix
-rm_conffile xlibs /etc/X11/xkb/geometry/kinesis
-rm_conffile xlibs
Bug#259632: xkb: Unitek KB-2125 multimedia keys not supported
On Fri, Sep 14, 2007, Mohammed Adnène Trojette wrote: On Thu, Jul 15, 2004, Nicolas DEGAND wrote: The multimedia keys of the keyboard are not recognized. I have collected their names with xev, but do not know how to implement them : Hi Nicolas, I've forwarded your bug report to upstream. Please see https://bugs.freedesktop.org/show_bug.cgi?id=11520 # --- Comment #1 From Sergey V. Udaltsov 2007-07-10 06:30:03 PST [reply] --- # # Look at the file symbols/inet, you'll find a number of definitions similar to # the one you need. They are using the keycodes defined in keycodes/xfree86. # # So, looking forward to getting a patch for symbols/inet from you;) Please answer. As I am cleaning xkb-data bug reports, I may close this bug if I don't get any news soon. -- Mohammed Adnène Trojette
Bug#460273: xbase-clients: IBM Thinkpad T61 key slash/question doenst works
On Fri, Jan 11, 2008, Jose Carlos Medeiros wrote:
I have a IBM Thinkpad T61 (Type 7663-B93) that has a Brazillian ABNT2
keyboard.
Talking with IBM Support I discover thar this key is a Right Control ,
and was changed to slash/question.
To solve this problem I create a .Xmodmap file with:
---
keycode 109 = slash question degree
---
Are you sure you're experiencing this bug on Debian too?
Because the br layout file already contains this block:
| // ABNT2 Keyboard to IBM/Lenovo Thinkpads
| // by Piter PUNK [EMAIL PROTECTED]
| //
| partial alphanumeric_keys
| xkb_symbols thinkpad {
|
| include br(abnt2) // for consistent naming
| name[Group1]=Brazil;
|
| key RCTL { [ slash, question, degree, questiondown ] };
| };
--
Mohammed Adnène Trojette
Bug#404596: gvorak layout
On Mon, Jan 07, 2008, Antonis Antoniadis wrote: people, but i don't intend rewritting it to be used by setxkbmap, i think it's more complicated than it's worth. Take a look at /usr/share/X11/xkb/symbols/gr on your system. You'll be able to determine where to put your keys. If you don't want to do it, please reply to [EMAIL PROTECTED] -- Mohammed Adnène Trojette
xkb-data: Changes to 'debian-unstable'
debian/xkb-data.postinst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b4d73550cc7ca068f17bd146c7033d0ba45330cc Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sun Jan 6 18:33:04 2008 +0100 Use find -not -name instead of find | grep -v. diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst index 3f1ccfe..adb634d 100644 --- a/debian/xkb-data.postinst +++ b/debian/xkb-data.postinst @@ -8,7 +8,7 @@ case $1 in configure) if [ -d /etc/X11/xkb/ -a `find /etc/X11/xkb/ | wc -l` -ne 1 ] then - find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs --no-run-if-empty rm + find /etc/X11/xkb/* -not -name base.xml* | xargs --no-run-if-empty rm fi ;; -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xkb-data: Changes to 'debian-unstable'
debian/changelog | 13 +++--
debian/control |3 +--
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit d35c7c0cf0530fc8d1268688898ad6bab1e042b1
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sat Jan 5 13:33:46 2008 +0100
Use a Homepage field and fix typos
diff --git a/debian/changelog b/debian/changelog
index 7b4b8f6..2fdf6a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,22 +4,23 @@ xkeyboard-config (1.1~cvs.20080104.1-1) UNRELEASED;
urgency=low
+ fixed Latin American layout. (Closes: #444035)
+ fixed Cherry CyMotion Master Linux layout. (Closes: #343929)
+ fixed HP Compaq nx9020 layout. (Closes: #395883)
- + splitted Serbia and Montenegro. (Closes: #451622)
+ + split Serbia and Montenegro. (Closes: #451622)
+ added fr(nodeadkeys) to mac. (Closes: #456942)
+ fixed mapping for shift+backslash in il keyboard. (Closes: #457927)
+ added English quotation marks to intl keymaps. (Closes: #453675)
+ * debian/control:
+ + bumped Standards-Version to 3.7.3.
+ + used Vcs-Git and Vcs-Browser fields.
+ + use a Homepage field.
* Refreshed resync_rules_base.diff. (Closes: #442942)
* Documented the creation of a custom layout in README.Debian and
-make /usr/share/X11/xkb/rules/base.xml a symlink to
-/etc/X11/xkb/base.xml configuration file.
+made /usr/share/X11/xkb/rules/base.xml a symlink to
+/etc/X11/xkb/base.xml.
(Closes: #410628, #410903, #438940)
* Remove files left in /etc/X11/xkb/. (Closes: #366180)
* New patch: add_void_definition_pl-324647.diff
+ don't use rules/latin's definitions for alt+{w,q,f}.
(Closes: #324647)
- * debian/control:
- + bumped Standards-Version to 3.7.3.
- + used Vcs-Git and Vcs-Browser fields.
-- Mohammed Adnène Trojette [EMAIL PROTECTED] Fri, 04 Jan 2008 22:47:11
+0100
diff --git a/debian/control b/debian/control
index 52a9e48..a56f8c0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends-Indep: libxml-parser-perl
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xkb-data.git
+Homepage: http://www.freedesktop.org/Software/XKeyboardConfig
Package: xkb-data
Architecture: all
@@ -20,5 +21,3 @@ Description: X Keyboard Extension (XKB) configuration data
designers have to send their layouts to several places. The
xkeyboard-config project has been launched at FreeDesktop in order
to provide a central repository that could be used by all vendors.
- .
- Homepage: http://www.freedesktop.org/Software/XKeyboardConfig
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xkb-data: Changes to 'debian-unstable'
ChangeLog | 224 +++ INSTALL| 236 +++ Makefile.am|3 Makefile.in| 45 NEWS |3 aclocal.m4 | 465 ++ compat/Makefile.am |2 compat/Makefile.in | 37 compat/compat.dir |1 compat/olpc| 52 config.guess | 601 config.sub | 145 +- configure | 2570 ++-- configure.in | 13 debian/README.Debian | 22 debian/changelog | 12 debian/control |4 docs/Makefile.in | 35 geometry/Makefile.in | 35 geometry/digital_vndr/Makefile.in | 35 geometry/geometry.dir | 13 geometry/microsoft | 281 +++ geometry/pc| 132 - geometry/sgi_vndr/Makefile.in | 35 intltool-extract.in| 18 intltool-merge.in | 153 +- intltool-update.in | 10 keycodes/Makefile.in | 35 keycodes/digital_vndr/Makefile.in | 35 keycodes/evdev | 10 keycodes/keycodes.dir |1 keycodes/sgi_vndr/Makefile.in | 35 keymap/Makefile.in | 35 keymap/digital_vndr/Makefile.in| 35 keymap/sgi_vndr/Makefile.in| 35 keymap/sun_vndr/Makefile.in| 35 po/ChangeLog |8 po/Makefile.in |7 po/Makefile.in.in | 218 +++ po/Makevars| 41 po/af.po | 2044 +--- po/az.po | 2044 +--- po/bg.po | 2633 - po/cs.po | 2041 +--- po/da.po | 2044 +--- po/el.po | 2173 +++--- po/fi.po | 1577 ++ po/hu.po | 1835 + po/nl.po | 1119 --- po/rw.po | 1203 +++- po/sq.po | 2038 +--- po/sv.po | 1104 --- po/uk.po | 1083 --- po/vi.po | 2262 ++- po/zh_CN.po| 2043 +--- rules/Makefile.am | 28 rules/Makefile.in | 64 rules/base | 569 --- rules/base.lists.part | 10 rules/base.lst | 69 rules/base.m_g.part|1 rules/base.m_k.part|4 rules/base.ml_c.part |1 rules/base.ml_s.part |5 rules/base.o_s.part|5 rules/base.xml.in | 292 +++- rules/compat/Makefile.in | 35 rules/compat/base.l2_s.part|2 rules/compat/base.l2v2_s.part |2 rules/compat/base.l3_s.part|2 rules/compat/base.l3v3_s.part |2 rules/compat/base.l4_s.part|2 rules/compat/base.l4v4_s.part |2 rules/compat/base.lists.part |2 rules/compat/base.ml1_s.part |2 rules/compat/base.ml1v1_s.part |2 rules/compat/base.ml_s.part|2 rules/compat/base.mlv_s.part |2 rules/compat/layoutRename.lst |1 rules/compat/variantRename.lst |6 rules/merge.sh |3 semantics/Makefile.in | 35 symbols/Makefile.am| 42 symbols/Makefile.in| 75 - symbols/af | 187 ++ symbols/ara| 65 symbols/ba | 12 symbols/br | 253 +++ symbols/capslock |7 symbols/cs |2 symbols/de | 14 symbols/digital_vndr/Makefile.in | 35 symbols/dk | 10 symbols/ee | 30 symbols/es | 38 symbols/et |8 symbols/eurosign | 19 symbols/fi | 192 +- symbols/fr | 62 symbols/fujitsu_vndr/Makefile.in | 35 symbols/ge | 62 symbols/gr | 168 +- symbols/group | 23
xkb-data: Changes to 'debian-unstable'
debian/xkb-data.dirs |1 + 1 file changed, 1 insertion(+) New commits: commit 1b5b029ec5104f332cd74902c846897198cb4241 Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sat Jan 5 00:23:34 2008 +0100 Synchronise with upstream's CVS + added fr(nodeadkeys) to mac. (Closes: #456942) + fixed mapping for shift+backslash in il keyboard. (Closes: #457927) diff --git a/debian/xkb-data.dirs b/debian/xkb-data.dirs new file mode 100644 index 000..43a6e62 --- /dev/null +++ b/debian/xkb-data.dirs @@ -0,0 +1 @@ +etc/X11/xkb -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xkb-data: Changes to 'debian-unstable'
ChangeLog |4 +++-
debian/README.Debian |4 ++--
debian/changelog | 22 +-
debian/patches/clean.diff | 16
debian/rules |5 +
debian/xkb-data.postinst | 28
symbols/macintosh_vndr/fr | 12
symbols/macintosh_vndr/us |2 +-
8 files changed, 72 insertions(+), 21 deletions(-)
New commits:
commit 464b6f88adfb41435db8f02d6348bf945e43ac21
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sat Jan 5 00:32:24 2008 +0100
update debian/changelog accordingly
diff --git a/debian/changelog b/debian/changelog
index acff4ee..34b22c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xkeyboard-config (1.1~cvs.20080104.1-1) UNRELEASED;
urgency=low
make /usr/share/X11/xkb/rules/base.xml a symlink to
/etc/X11/xkb/base.xml configuration file.
(Closes: #410628, #410903, #438940)
+ * Remove files left in /etc/X11/xkb/. (Closes: #366180)
* New patch: add_void_definition_pl-324647.diff
+ don't use rules/latin's definitions for alt+{w,q,f}.
(Closes: #324647)
commit afffbc967cda0f0a0cd14b70db016cb1510df28f
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sat Jan 5 00:30:31 2008 +0100
remove what is in /etc/X11/xkb/
diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
new file mode 100644
index 000..5d2b358
--- /dev/null
+++ b/debian/xkb-data.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+# postinst script for xkb-data
+#
+
+set -e
+
+case $1 in
+configure)
+ find /etc/X11/xkb | grep -v '/^base.xml/' | xargs rm
+;;
+
+abort-upgrade|abort-remove|abort-deconfigure)
+;;
+
+*)
+echo postinst called with unknown argument \`$1' 2
+exit 1
+;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
commit 7437ea2662ea40a098b7caac8ba38bc3da6c4d8d
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sat Jan 5 00:27:23 2008 +0100
- put base.xml in /etc/X11/xkb and make a symlink in /usr/share/X11/xkb/
- sync with upstream's CVS
diff --git a/ChangeLog b/ChangeLog
index 6379cb2..e431e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* symbols/inet, rules/base.lists.part, rules/base.xml.in: adding BTC
6301URF, https://bugs.freedesktop.org/show_bug.cgi?id=13913
+ * symbols/macintosh_vndr/fr: added nodeadkeys,
+ https://bugs.freedesktop.org/show_bug.cgi?id=13934
2008-01-03 Sergey Udaltsov
@@ -1904,7 +1906,7 @@
2004-09-13 22:39 svu
- * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.387 2008-01-04 21:07:52 svu Exp $
+ * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.388 2008-01-04 22:34:04 svu Exp $
2004-09-13 22:38 svu
diff --git a/debian/README.Debian b/debian/README.Debian
index c1f1006..7d74dfb 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -68,7 +68,7 @@ For instance, to create a French layout altering the 'a' key,
create a
| };
To have it appear in your desktop environment layout manager, add
-my_fr in /usr/share/X11/xkb/rules/base.xml as a new layout. For
+my_fr in /etc/X11/xkb/base.xml as a new layout. For
example, insert the following lines (without the pipes):
|layout
@@ -80,6 +80,6 @@ example, insert the following lines (without the pipes):
| variantList/
|/layout
-/usr/share/X11/xkb/rules/base.xml is a configuration file.
+/etc/X11/xkb/base.xml is a configuration file.
Mohammed Adnène Trojette [EMAIL PROTECTED] Sun, 23 Sep 2007 00:05:50 +0200
diff --git a/debian/changelog b/debian/changelog
index 585ef11..acff4ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,23 @@
xkeyboard-config (1.1~cvs.20080104.1-1) UNRELEASED; urgency=low
* New upstream CVS snapshot from January 4th 2008:
- + fix Latin American layout. (Closes: #444035)
- + fix Cherry CyMotion Master Linux layout. (Closes: #343929)
- + fix HP Compaq nx9020 layout. (Closes: #395883)
- + split Serbia and Montenegro. (Closes: #451622)
- * Refresh resync_rules_base.diff. (Closes: #442942)
- * Document the creation of a custom layout in README.Debian and
-make /usr/share/X11/xkb/rules/base.xml a configuration file.
+ + fixed Latin American layout. (Closes: #444035)
+ + fixed Cherry CyMotion Master Linux layout. (Closes: #343929)
+ + fixed HP Compaq nx9020 layout. (Closes: #395883)
+ + splitted Serbia and Montenegro. (Closes: #451622)
+ + added fr(nodeadkeys) to mac. (Closes: #456942)
+ + fixed mapping for shift+backslash in il keyboard. (Closes: #457927)
+ * Refreshed resync_rules_base.diff. (Closes: #442942)
+ * Documented the creation of a custom layout in README.Debian and
+make /usr/share/X11/xkb/rules/base.xml a symlink
xkb-data: Changes to 'debian-unstable'
debian/conffiles |1 debian/patches/add_void_definition_pl-324647.diff | 2244 +- debian/patches/mac_poweroff.diff |6 debian/patches/resync_rules_base.diff | 1697 +++- debian/patches/sclk_toggle.diff | 16 debian/patches/unhide_lv3_enter_switch.diff | 16 debian/rules |4 debian/xkb-data.postinst |5 8 files changed, 3854 insertions(+), 135 deletions(-) New commits: commit e41682d15e5866ca243ead80cad1707ef83af160 Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sat Jan 5 01:26:46 2008 +0100 also work when directory is empty diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst index 5ac4acd..0d9f17c 100644 --- a/debian/xkb-data.postinst +++ b/debian/xkb-data.postinst @@ -6,7 +6,10 @@ set -e case $1 in configure) - find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs rm +if [ -d /etc/X11/xkb/ -a `find /etc/X11/xkb/|wc -l` -ne 1 ] +then + find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs rm +fi ;; abort-upgrade|abort-remove|abort-deconfigure) commit 260421453ed5866fe50b01d13cb13024896f78e6 Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sat Jan 5 00:58:34 2008 +0100 find inside the directory and don't try to remove it... diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst index 5d2b358..5ac4acd 100644 --- a/debian/xkb-data.postinst +++ b/debian/xkb-data.postinst @@ -6,7 +6,7 @@ set -e case $1 in configure) - find /etc/X11/xkb | grep -v '/^base.xml/' | xargs rm + find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs rm ;; abort-upgrade|abort-remove|abort-deconfigure) commit 5af8ea64fc6dc3401a1fd54d5a53ba464394e52d Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sat Jan 5 00:50:35 2008 +0100 stop being stupid when using dh_link diff --git a/debian/rules b/debian/rules index 130a67a..d410eba 100755 --- a/debian/rules +++ b/debian/rules @@ -109,7 +109,7 @@ install: build # Move base.xml to /etc/X11/xkb/ and make # /usr/share/X11/xkb/rules/base.xml links to it mv debian/xkb-data/usr/share/X11/xkb/rules/base.xml debian/xkb-data/etc/X11/xkb/ - dh_link debian/xkb-data/etc/X11/xkb/base.xml debian/xkb-data/usr/share/X11/xkb/rules/base.xml + dh_link etc/X11/xkb/base.xml usr/share/X11/xkb/rules/base.xml # Build architecture-dependent files here. binary-arch: build install commit d0e532589d17af3d945c2d8cb4c1eb80cb1cf29b Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sat Jan 5 00:47:44 2008 +0100 removed unnecessary file diff --git a/debian/conffiles b/debian/conffiles deleted file mode 100644 index e24f45f..000 --- a/debian/conffiles +++ /dev/null @@ -1 +0,0 @@ -/usr/share/X11/xkb/rules/base.xml commit ccfa96b033ab33655cb4073d0276873df8f4e969 Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sat Jan 5 00:44:21 2008 +0100 fix dir diff --git a/debian/rules b/debian/rules index d1edbe4..130a67a 100755 --- a/debian/rules +++ b/debian/rules @@ -108,8 +108,8 @@ install: build # Move base.xml to /etc/X11/xkb/ and make # /usr/share/X11/xkb/rules/base.xml links to it - mv debian/usr/share/X11/xkb/rules/base.xml debian/etc/X11/xkb/ - dh_link debian/etc/X11/xkb/base.xml debian/usr/share/X11/xkb/rules/base.xml + mv debian/xkb-data/usr/share/X11/xkb/rules/base.xml debian/xkb-data/etc/X11/xkb/ + dh_link debian/xkb-data/etc/X11/xkb/base.xml debian/xkb-data/usr/share/X11/xkb/rules/base.xml # Build architecture-dependent files here. binary-arch: build install commit 6a2b0ce385af3df07c635fc991d8e9bdc64adb1f Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sat Jan 5 00:40:50 2008 +0100 refresh patch diff --git a/debian/patches/add_void_definition_pl-324647.diff b/debian/patches/add_void_definition_pl-324647.diff index 16f2021..45a0f3d 100644 --- a/debian/patches/add_void_definition_pl-324647.diff +++ b/debian/patches/add_void_definition_pl-324647.diff @@ -1,7 +1,2247 @@ +Index: xkb-data/rules/base +=== +--- /dev/null 1970-01-01 00:00:00.0 + xkb-data/rules/base2008-01-05 00:40:01.0 +0100 +@@ -0,0 +1,949 @@ ++// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part ++// $Xorg: xfree86,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ ++ ++// ++// Rules for resolving XKB components for use with XFree86 ++// Copyright 1996 by Joseph Moss ++// ++// 2002 Modifier: Ivan Pascal The XFree86 Project ++// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.79 2004/01/09 00:16:01 dawes Exp $ ++// ++ ++// If you want non-latin layouts implicitly include the en_US layout ++// uncomment lines
xkb-data: Changes to 'debian-unstable'
ChangeLog|7 ++-
debian/changelog |1 +
debian/xkb-data.postinst |4 ++--
symbols/us |6 +++---
4 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit d876da4cad1ed9b0544d1c8f25454af8cbd6779b
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sat Jan 5 02:11:04 2008 +0100
--no-run-if-empty
diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
index 5a5bded..3f1ccfe 100644
--- a/debian/xkb-data.postinst
+++ b/debian/xkb-data.postinst
@@ -6,11 +6,9 @@ set -e
case $1 in
configure)
-if [ -d /etc/X11/xkb/ \
- -a `find /etc/X11/xkb/ | grep -v '/etc/X11/xkb/base.xml' | wc
-l` -ne 1 \
- -a `find /etc/X11/xkb/ | grep '/etc/X11/xkb/base.xml' | wc -l`
-ne 1 ]
+if [ -d /etc/X11/xkb/ -a `find /etc/X11/xkb/ | wc -l` -ne 1 ]
then
- find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs rm
+ find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs
--no-run-if-empty rm
fi
;;
commit 871785a6a13a218eaa1479d748a5dbcae7bf72ae
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sat Jan 5 01:46:21 2008 +0100
+ added English quotation marks to intl keymaps. (Closes: #453675)
diff --git a/ChangeLog b/ChangeLog
index e431e98..0913882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-05 Sergey Udaltsov
+
+ * symbols/us: add (left,right)singlequotemark to us(-altgr)-intl
+ keymap, https://bugs.freedesktop.org/show_bug.cgi?id=13935
+
2008-01-04 Sergey Udaltsov
* symbols/inet, rules/base.lists.part, rules/base.xml.in: adding BTC
@@ -1906,7 +1911,7 @@
2004-09-13 22:39 svu
- * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.388 2008-01-04 22:34:04 svu Exp $
+ * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.389 2008-01-05 00:40:38 svu Exp $
2004-09-13 22:38 svu
diff --git a/debian/changelog b/debian/changelog
index 34b22c8..7b4b8f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xkeyboard-config (1.1~cvs.20080104.1-1) UNRELEASED; urgency=low
+ splitted Serbia and Montenegro. (Closes: #451622)
+ added fr(nodeadkeys) to mac. (Closes: #456942)
+ fixed mapping for shift+backslash in il keyboard. (Closes: #457927)
+ + added English quotation marks to intl keymaps. (Closes: #453675)
* Refreshed resync_rules_base.diff. (Closes: #442942)
* Documented the creation of a custom layout in README.Debian and
make /usr/share/X11/xkb/rules/base.xml a symlink to
diff --git a/symbols/us b/symbols/us
index 401211c..ea15c5b 100644
--- a/symbols/us
+++ b/symbols/us
@@ -1,4 +1,4 @@
-// $XKeyboardConfig: xkeyboard-config/symbols/us,v 1.41 2007-11-30 22:01:17
svu Exp $
+// $XKeyboardConfig: xkeyboard-config/symbols/us,v 1.42 2008-01-05 00:40:38
svu Exp $
//
// $XdotOrg: xc/programs/xkbcomp/symbols/us,v 1.1.4.3 2004/03/05 13:41:33 eich
Exp $
@@ -111,8 +111,8 @@ xkb_symbols intl {
key AD08 { [i, I,iacute, Iacute ] };
key AD09 { [o, O,oacute, Oacute ] };
key AD10 { [p, P,odiaeresis, Odiaeresis ] };
-key AD11 { [ bracketleft, braceleft, guillemotleft, guillemotleft ] };
-key AD12 { [bracketright, braceright, guillemotright,guillemotright ] };
+key AD11 { [ bracketleft, braceleft, guillemotleft,
leftdoublequotemark ] };
+key AD12 { [bracketright, braceright, guillemotright,
rightdoublequotemark ] };
key AC01 { [a, A,aacute, Aacute ] };
key AC02 { [s, S,ssharp, section ] };
commit 8a9e71072261870ade33a699b1bf9116857997b8
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sat Jan 5 01:40:24 2008 +0100
and make it silent
diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
index 5486c85..5a5bded 100644
--- a/debian/xkb-data.postinst
+++ b/debian/xkb-data.postinst
@@ -2,7 +2,7 @@
# postinst script for xkb-data
#
-set -ex
+set -e
case $1 in
configure)
commit 0a32eade0696478c44f17e0c87ef20dac8d74901
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sat Jan 5 01:39:59 2008 +0100
Don't make rm miss an operand...
diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
index 0d9f17c..5486c85 100644
--- a/debian/xkb-data.postinst
+++ b/debian/xkb-data.postinst
@@ -2,11 +2,13 @@
# postinst script for xkb-data
#
-set -e
+set -ex
case $1 in
configure)
-if [ -d /etc/X11/xkb/ -a `find /etc/X11/xkb/|wc -l` -ne 1 ]
+if [ -d /etc/X11/xkb/ \
+ -a `find /etc/X11/xkb/ | grep -v '/etc/X11/xkb/base.xml' | wc
-l` -ne 1 \
+ -a `find /etc/X11/xkb/ | grep '/etc/X11/xkb/base.xml' | wc -l`
-ne 1 ]
then
find /etc/X11/xkb/* | grep -v
Bug#404596: gvorak layout
On Fri, Sep 14, 2007, Mohammed Adnène Trojette wrote: On Thu, Mar 22, 2007, Antonis Antoniadis wrote: I am sorry, here there is the layout Hi Antonis, I've forwarded your request to upstream. Please see https://bugs.freedesktop.org/show_bug.cgi?id=11521. # --- Comment #1 From Sergey V. Udaltsov 2007-07-10 08:33:17 PST [reply] --- # # Unfortunately your layout is not in format acceptable by XKB. Could you please # have a look at, say, symbols/ge and contribute something compatible with XKB # format. Thanks. Please answer. As I am cleaning xkb-data bug reports, I may close this bug if I don't get any news soon. -- Mohammed Adnène Trojette
Bug#425655: xkb-data: Media key symbols for Logitech UltraX keyboard
On Sat, Aug 11, 2007, Mohammed Adnène Trojette wrote: Hi, upstream followed up on https://bugs.freedesktop.org/show_bug.cgi?id=11518 He has a question for you: I see your point regarding Email. But I do not really understand the difference between HomePage and WWW in this context. Could you please give a bit more details - why is it so essential for you? Anyway, shortcuts can be bound to any of these keysyms. Hi, are you still experiencing this bug? If so, please answer to upstream. With no answer from you, I'll close the bug soon. -- Mohammed Adnène Trojette
Bug#421189: Remove/merge redundant dvorak file
On Sat, Aug 11, 2007, Mohammed Adnène Trojette wrote: The dvorak file has (largely) compatible equivalents in the respective national keyboard layouts, so having a specific dvorak file is confusing to users and leads to inconsistencies like the above - if it's really important that both exist, could you make dvorak($lang) just include the settings from $lang(dvorak)? Do yo reproduce this bug with the version in unstable? With no answer from you, I am going to close this bug report soon. -- Mohammed Adnène Trojette
Bug#347149: gnome-control-center: U.S. English keyboard options are confusing
tag 347149 + moreinfo thanks On Mon, Jan 09, 2006, Michael Shields wrote: gnome-keyboard-properties includes the following five options for keyboard layout (among others): - U.S. English - International (with dead keys) - U.S. English w/ dead keys - U.S. English w/ ISO9995-3 - Eliminate dead keys This is no longer the case. Can we consider this bug fixed with the last versions of xkb-data? -- Mohammed Adnène Trojette
Bug#355822: xkb: some multimedia sends events forever once pressed
On Sat, Aug 11, 2007, Mohammed Adnène Trojette wrote: On Thu, May 03, 2007, Gilles Grandou wrote: Hi Mohammed, Hi, upstream commented on your bug on https://bugs.freedesktop.org/show_bug.cgi?id=11515: It looks to me like a bug in the keyboard driver (X or kernel). The key should not endlessly generate X events when it is not actually pressed (do I understand you right?) Hi Gilles. Please answer the mail above or I will have to close the bug report. -- Mohammed Adnène Trojette
Bug#443647: xkb-data missing some characters in gurmukhi (gur) keymap
On Fri, Sep 28, 2007, H. S. wrote: Here you go (again, this is on Debian Unstable): $ diff -u gur gur-ks Sorry, but please do it on /usr/share/X11/xkb/symbols/in. /etc/X11/xkb/symbols/gur is *obsolete*. -- Mohammed Adnène Trojette
Bug#443647: xkb-data missing some characters in gurmukhi (gur) keymap
On Tue, Sep 25, 2007, H. S. wrote: Thanks for the patch. The line change for the character 0A5C works (for ੜ), but the last one for A71 does not. It is probably becuase I am not sure what is my modifier key in guru keyboard layout (I am in KDE). I have tried CTRL-, CTRL+ALT, and these two keys on the right hand side of the space bars. None worked. Please could you test and find the correct fix, so that I can forward it upstream? -- Mohammed Adnène Trojette
Bug#443647: xkb-data missing some characters in gurmukhi (gur) keymap
On Sun, Sep 23, 2007, H. S. wrote:
am guessing it can be put as SHIFT+A30), line no. 50 in /etc/X11/xkb/symbols/
Hi!
What we need is a patch against /usr/share/X11/xkb/symbols/in
(/etc/X11/xkb/symbols/ is obsolete).
Please could you tell me whether the attached patch fixes the issue?
--
Mohammed Adnène Trojette
--- /usr/share/X11/xkb/symbols/in 2007-09-23 02:32:29.0 +0200
+++ /usr/share/X11/xkb/symbols/in.new 2007-09-25 00:24:08.0 +0200
@@ -946,7 +946,7 @@
// Mainly unvoiced consonants
key AC06 { [ 0x1000A2A, 0x1000A2B ] };
- key AC07 { [ 0x1000A30, 0x1000A30 ] };
+ key AC07 { [ 0x1000A30, 0x1000A5C ] };
key AC08 { [ 0x1000A15, 0x1000A16 ] };
key AC09 { [ 0x1000A24, 0x1000A25 ] };
key AC10 { [ 0x1000A1A, 0x1000A1B ] };
@@ -954,7 +954,7 @@
key BKSL { [ backslash, bar ] };
key AB01 { [ z, Z ] };
- key AB02 { [ 0x1000A02, 0x1000A70 ] };
+ key AB02 { [ 0x1000A02, 0x1000A70, 0x1000A71 ] };
key AB03 { [ 0x1000A2E, 0x1000A23 ] };
key AB04 { [ 0x1000A28, 0x1000A28 ] };
key AB05 { [ 0x1000A35, 0x1000A35 ] };
Bug#409612: xlibs-data: Modifier mappings broken
On Sun, Sep 23, 2007, Tuomo Valkonen wrote:
Does recent mean something later than etch? In that case I can't
help now, and unlikely in the future either (because the present
2.6.14 kernel and etch setup is likely to be my last Linux setup
ever unless something marvellous happens, which seems unlikely).
In any case, the output from that command is
_XKB_RULES_NAMES(STRING) = xfree86, logicdp, fi, nodeadkeys,
ctrl:nocaps
But, as mentioned above, I don't actually use Xkb crud at all myself
(thanks to the use of ISO_Level3_Shift instead of Mode_Switch, only
the latter of which can be customised easily with xmodmap, Xkb
configuration itself being cryptic and ultra-complex like almost
anything recent in *nix).
Maybe some people on the Ion list can be of more help; I just reported
this bug because nobody else seemed to be arsed to.
I forwarded your bug upstream. And upstream is asking to try commenting
the lines
key SUPR {[ NoSymbol, Super_L ] };
modifier_map Mod4 { SUPR };
in symbols/pc
(please see http://bugs.freedesktop.org/show_bug.cgi?id=12526)
--
Mohammed Adnène Trojette
xkb-data: Changes to 'debian-unstable'
debian/README.Debian | 24
debian/changelog |5 -
debian/conffiles |1 +
3 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit ad50b0b8a9d71dc765e2fe972f38ca7f6b942568
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sun Sep 23 01:59:17 2007 +0200
Document the creation of a custom layout in README.Debian and
make /usr/share/X11/xkb/rules/base.xml a configuration file.
(Closes: #410628, #410903, #438940)
diff --git a/debian/README.Debian b/debian/README.Debian
index d0a469e..e84d8a7 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -46,3 +46,27 @@ in /etc/X11/xorg.conf can be replaced by
Option XkbOptions lv3:enter_switch,apple:badmap,numpad:mac
Denis Barbier [EMAIL PROTECTED] Thu, 5 Oct 2006 22:51:12 +0200
+
+Create a new layout
+---
+
+Since 0.8-1, layouts are read from /usr/share/X11/xkb/ and no more
+/etc/X11/xkb. Thus, layouts are no more conffiles. The best way to
+have a custom layout is to create one's own layout that includes other
+layouts and customises some keys you want to modify.
+
+To create a French layout modifying the 'a' key, create a
+/usr/share/X11/xkb/symbols/my_fr file containing the following lines
+(without the pipes):
+
+ | partial alphanumeric_keys
+ | xkb_symbols my_fr {
+ | include fr
+ | key AD01 { [ a, A, oe, OE ] };
+ | };
+
+To have it appear in your desktop environment layout manager, don't
+forget to add my_fr in /usr/share/X11/xkb/rules/base.xml as a new
+layout.
+
+Mohammed Adnène Trojette [EMAIL PROTECTED] Sun, 23 Sep 2007 00:05:50 +0200
diff --git a/debian/changelog b/debian/changelog
index cb25022..5ee229a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
xkeyboard-config (1.0~cvs.20070916-2) UNRELEASED; urgency=low
* Refresh resync_rules_base.diff. (Closes: #442942)
+ * Document the creation of a custom layout in README.Debian and
+make /usr/share/X11/xkb/rules/base.xml a configuration file.
+(Closes: #410628, #410903, #438940)
- -- Mohammed Adnène Trojette [EMAIL PROTECTED] Tue, 18 Sep 2007 16:54:39
+0200
+ -- Mohammed Adnène Trojette [EMAIL PROTECTED] Fri, 21 Sep 2007 17:58:59
+0200
xkeyboard-config (1.0~cvs.20070916-1) unstable; urgency=low
diff --git a/debian/conffiles b/debian/conffiles
new file mode 100644
index 000..e24f45f
--- /dev/null
+++ b/debian/conffiles
@@ -0,0 +1 @@
+/usr/share/X11/xkb/rules/base.xml
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#438940: xkb-data: package overwrite user-modified files without notice
On Tue, Aug 21, 2007, Drew Parsons wrote: For some reason I find I still have the old xlibs package installed. Curiously it seemed to place the xkb data files in /etc/X11/xkb/symbols. Perhaps we should alter xkb-data to do the same again? (we could symlink from /usr/share/X11/xkb to /etc/X11/xkb, or symlink specific subdirs as appropriate) An old preinst (still present on Ubuntu) create symlinks from /etc/X11/xkb to /usr/share/X11/xkb. But now, the problem is some people modified files in /etc and other in /usr. So the merge is impossible. I guess we will have to remove /etc/X11/xkb/symbols completely some day in the future. -- Mohammed Adnène Trojette
Bug#438940: xkb-data: package overwrite user-modified files without notice
forcemerge 410903 438940 thanks On Tue, Aug 21, 2007, Cedric Pradalier wrote: I like to modify my keyboard configuration to suit my needs by modifying files in /usr/share/X11/xkb/symbols. Each time xkb-data is updated, it overwrites my modifications. I think this files should be considered configuration files as if they were in etc, and the same behaviour should apply. If the file has been modified since last install, then ask user for advice, or back it up. What you should do is to create a custom layout in /usr/share/X11/xkb/symbols and include existing layouts then redefining some keys. This custom layout won't be overwritten. Files in /usr/share/X11/xkb/symbols are not conffiles and are not going to be so. Maybe I'll make some files in /usr/share/X11/xkb/rules/ conffiles but I am not sure which ones yet. This will be documented in README.Debian and uploaded in the next upload. Please could you tell me what modifications you do in /usr/share/X11/xkb/symbols? Maybe these are legitimate fixes? -- Mohammed Adnène Trojette
xkb-data: Changes to 'debian-unstable'
debian/README.Debian | 39 +--
1 file changed, 29 insertions(+), 10 deletions(-)
New commits:
commit df595223387e21927dffe5378c671bb1829a3e7d
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sun Sep 23 02:52:49 2007 +0200
Reword it better
diff --git a/debian/README.Debian b/debian/README.Debian
index e84d8a7..6b9c668 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -47,15 +47,17 @@ in /etc/X11/xorg.conf can be replaced by
Denis Barbier [EMAIL PROTECTED] Thu, 5 Oct 2006 22:51:12 +0200
-Create a new layout
+Customised layouts
+--
-Since 0.8-1, layouts are read from /usr/share/X11/xkb/ and no more
-/etc/X11/xkb. Thus, layouts are no more conffiles. The best way to
-have a custom layout is to create one's own layout that includes other
-layouts and customises some keys you want to modify.
+Since 0.8-1, layouts are read from /usr/share/X11/xkb/symbols and no
+more from /etc/X11/xkb/symbols. Thus, layouts are no more conffiles.
+The good way to have a custom layout is to create one's own layout that
+includes other layouts and customises some keys you want to modify.
-To create a French layout modifying the 'a' key, create a
+Do not modify directly files /usr/share/X11/xkb/symbols.
+
+For instance, to create a French layout altering the 'a' key, create a
/usr/share/X11/xkb/symbols/my_fr file containing the following lines
(without the pipes):
@@ -65,8 +67,25 @@ To create a French layout modifying the 'a' key, create a
| key AD01 { [ a, A, oe, OE ] };
| };
-To have it appear in your desktop environment layout manager, don't
-forget to add my_fr in /usr/share/X11/xkb/rules/base.xml as a new
-layout.
+To have it appear in your desktop environment layout manager, add
+my_fr in /usr/share/X11/xkb/rules/base.xml as a new layout. For
+example, insert the following lines (without the pipes):
+
+ |layout
+ | configItem
+ |namemy_fr/name
+ |shortDescriptionMyFr/shortDescription
+ | /configItem
+ | variantList
+ |variant
+ | configItem
+ |namemy_fr/name
+ |descriptionMy customised French layout/description
+ | /configItem
+ |/variant
+ | /variantList
+ |/layout
+
+/usr/share/X11/xkb/rules/base.xml is a configuration file.
Mohammed Adnène Trojette [EMAIL PROTECTED] Sun, 23 Sep 2007 00:05:50 +0200
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#435748: xkb-data: 0.9-4 - 1.0~cvs.20070721-1 breaks assigning Alt_R to mod3
forcemerge 400515 435748 thanks On Thu, Aug 02, 2007, Alec Berryman wrote: add Mod3 = Alt_R It's worked for a year or two now, but stopped working when I upgraded xkb-data from 0.9-4 to 1.0~cvs.20070721-1 (it recently hit testing). Reverting to 0.9-4 fixes this behavior. Please try to set the lv3:ralt_alt option to have your Mod3 key back. -- Mohammed Adnène Trojette
Bug#291853: xkbcomp warns about RALT having 2 symbols
On Thu, Apr 05, 2007, Mario 'BitKoenig' Holbe wrote: reopen 291853 thanks On Wed, Mar 21, 2007 at 11:24:24PM +0100, Brice Goglin wrote: This problem seems to be gone again in Etch. Closing. Hmmm - unfortunately, I cannot confirm that. My xkb-data version is 0.9-4 and the warning appears with that. I did even wait some time in the hope there will be some package update which you are referring to but there was none. Hi Mario and [EMAIL PROTECTED], do you have something defined in your .xmodmap file? What is the result of the commands 'xmodmap' and 'xmodmap -pk'? -- Mohammed Adnène Trojette
xkb-data: Changes to 'debian-unstable'
debian/changelog |3 +
debian/patches/add_void_definition_pl-324647.diff | 52 ++
debian/patches/series |1
3 files changed, 56 insertions(+)
New commits:
commit eb98ac179bdc5c9e499b5bd40075414ecc395b3c
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sun Sep 23 03:49:39 2007 +0200
New patch: add_void_definition_pl-324647.diff
+ don't use rules/latin's definitions for alt+{w,q,f}.
(Closes: #324647)
diff --git a/debian/changelog b/debian/changelog
index 5ee229a..684acb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xkeyboard-config (1.0~cvs.20070916-2) UNRELEASED; urgency=low
* Document the creation of a custom layout in README.Debian and
make /usr/share/X11/xkb/rules/base.xml a configuration file.
(Closes: #410628, #410903, #438940)
+ * New patch: add_void_definition_pl-324647.diff
+ + don't use rules/latin's definitions for alt+{w,q,f}.
+ (Closes: #324647)
-- Mohammed Adnène Trojette [EMAIL PROTECTED] Fri, 21 Sep 2007 17:58:59
+0200
diff --git a/debian/patches/add_void_definition_pl-324647.diff
b/debian/patches/add_void_definition_pl-324647.diff
new file mode 100644
index 000..16f2021
--- /dev/null
+++ b/debian/patches/add_void_definition_pl-324647.diff
@@ -0,0 +1,52 @@
+Index: xkb-data/symbols/pl
+===
+--- xkb-data.orig/symbols/pl 2007-09-23 03:41:39.0 +0200
xkb-data/symbols/pl2007-09-23 03:44:50.0 +0200
+@@ -11,11 +11,14 @@
+
+ name[Group1]=Poland;
+
++key AD01 { [ q, Q ] };
++key AD02 { [ w, W ] };
+ key AD03{ [ e, E, eogonek, Eogonek ]
};
+ key AD09{ [ o, O, oacute, Oacute ]
};
+
+ key AC01{ [ a, A, aogonek, Aogonek ]
};
+ key AC02{ [ s, S, sacute, Sacute ]
};
++key AC04 { [ f, F ] };
+
+ key AB01{ [ z, Z,zabovedot,Zabovedot ]
};
+ key AB02{ [ x, X, zacute, Zacute ]
};
+@@ -50,12 +53,15 @@
+ key AE11{ [ plus, question, dead_diaeresis, questiondown
] };
+ key AE12{ [apostrophe, asterisk, dead_cedilla, dead_ogonek ]
};
+
++key AD01 { [ q, Q ] };
++key AD02 { [ w, W ] };
+ key AD03{ [ e, E, EuroSign, cent ]
};
+ key AD11{ [ zabovedot, nacute, division, dead_abovering
] };
+ key AD12{ [sacute, cacute, multiply, dead_macron ]
};
+
+ key AC02{ [ s, S, dstroke, section ]
};
+ key AC03{ [ d, D, Dstroke, ETH ]
};
++key AC04 { [ f, F ] };
+ key AC08{ [ k, K, kra,ampersand ]
};
+ key AC09{ [ l, L, lstroke, Lstroke ]
};
+ key AC10{ [ lstroke,Lstroke, dollar,
dead_doubleacute ] };
+@@ -136,6 +142,8 @@
+
+ name[Group1]=Poland - Kashubian;
+
++key AD01 { [ q, Q ] };
++key AD02 { [ w, W ] };
+ key AD03{ [ e, E, eacute, Eacute ]
};
+ key AD04{ [ r, R, ediaeresis,
Ediaeresis ] };
+ key AD06 { [ y, Y, EuroSign, cent ]
};
+@@ -146,6 +154,7 @@
+
+ key AC01{ [ a, A, aogonek, Aogonek ]
};
+ key AC02{ [ s, S, atilde, Atilde ]
};
++key AC04 { [ f, F ] };
+ key AC09{ [ l, L, lstroke, Lstroke ]
};
+
+ key AB01{ [ z, Z,zabovedot,Zabovedot ]
};
diff --git a/debian/patches/series b/debian/patches/series
index a6b5570..da4ec82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ unhide_lv3_enter_switch.diff
resync_rules_base.diff
send-upstream/001_keypad_comma.diff
#send-upstream/002_add_asus6000.diff
+add_void_definition_pl-324647.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xkb-data: Changes to 'debian-unstable'
ChangeLog|9 -
debian/changelog |7 +++
keycodes/evdev | 14 +++---
symbols/inet | 10 +-
4 files changed, 27 insertions(+), 13 deletions(-)
New commits:
commit b05ab0f8f781856e93d66e05bde2a2d9d9228332
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Tue Sep 18 16:32:19 2007 +0200
releasing version 1.0~cvs.20070916-1
diff --git a/ChangeLog b/ChangeLog
index 9e8c5c4..3383f6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-14 Sergey Udaltsov
+
+ * symbols/inet: small fixes in cymotionlinux,
+ https://bugs.freedesktop.org/show_bug.cgi?id=7983
+ * keycodes/evdev: fixed fake keycodes,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12202
+
2007-09-05 Sergey Udaltsov
* symbols/inet, geometry/dell, rules/base.m_g.part,
@@ -1675,7 +1682,7 @@
2004-09-13 22:39 svu
- * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.329 2007-09-05 23:10:13 svu Exp $
+ * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.331 2007-09-14 22:12:47 svu Exp $
2004-09-13 22:38 svu
diff --git a/debian/changelog b/debian/changelog
index d2ed552..8ed8a36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xkeyboard-config (1.0~cvs.20070916-1) unstable; urgency=low
+
+ * New upstream CVS snapshot from September 16th 2007:
+ + fix evdev layout. (Closes: #442479)
+
+ -- Mohammed Adnène Trojette [EMAIL PROTECTED] Sun, 16 Sep 2007 18:51:30
+0200
+
xkeyboard-config (1.0~cvs.20070914-1) unstable; urgency=low
* New upstream CVS snapshot from September 14th 2007:
diff --git a/keycodes/evdev b/keycodes/evdev
index 1c246d4..13b19f9 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -1,7 +1,7 @@
// translation from evdev scancodes to something resembling xfree86 keycodes.
default xkb_keycodes evdev {
- minimum = 1;
+ minimum = 8;
maximum = 255;
# Added for pc105 compatibility
@@ -279,12 +279,12 @@ default xkb_keycodes evdev {
I253 = 253; // #define KEY_DISPLAY_OFF 245
// Fake keycodes for virtual keys
- MDSW = 1;
- LVL3 = 2;
- ALT = 3;
- META = 4;
- SUPR = 5;
- HYPR = 6;
+ LVL3 = 92;
+ MDSW = 203;
+ ALT = 204;
+ META = 205;
+ SUPR = 206;
+ HYPR = 207;
indicator 1 = Caps Lock;
indicator 2 = Num Lock;
diff --git a/symbols/inet b/symbols/inet
index bcb783a..c065d17 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -1,4 +1,4 @@
-// $XKeyboardConfig: xkeyboard-config/symbols/inet,v 1.63 2007-09-05 23:00:41
svu Exp $
+// $XKeyboardConfig: xkeyboard-config/symbols/inet,v 1.64 2007-09-14 21:23:23
svu Exp $
// $XFree86: xc/programs/xkbcomp/symbols/inet,v 1.38 2004/01/17 14:59:37
pascal Exp $
@@ -2040,12 +2040,10 @@ partial xkb_symbols apple {
partial alphanumeric_keys
xkb_symbols cymotionlinux {
include inet(media_common)
-keyRWIN { [ at ] };
-keyI68 { [ XF86Stop] };
key FK17 { [ XF86Search ] };
key I02 { [ XF86WWW ] };
+key I05 { [ Redo] };
key I07 { [ Undo] };
-key I0A { [ Redo] };
key I0F { [ XF86ScrollDown ] };
key I17 { [ XF86Launch2 ] };
key I1F { [ XF86Launch1 ] };
@@ -2053,9 +2051,10 @@ xkb_symbols cymotionlinux {
key I28 { [ XF86MenuKB ] };
key I2B { [ XF86Launch3 ] };
key I3C { [ XF86Cut ] };
+key I47 { [ XF86PowerOff] };
key I63 { [ XF86Standby ] };
key I67 { [ XF86Reload ] };
-key I68 { [ XF86PowerOff] };
+keyI68 { [ XF86Stop] };
key I69 { [ XF86Forward ] };
key I6A { [ XF86Back] };
key I6C { [ XF86Mail] };
@@ -2063,6 +2062,7 @@ xkb_symbols cymotionlinux {
key K65 { [ XF86Paste ] };
key K6C { [ XF86Eject ] };
key K75 { [ XF86ScrollUp] };
+keyRWIN { [ at ] };
key XFER { [ XF86AudioMedia ] };
};
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xkb-data: Changes to 'debian-unstable'
debian/changelog |6 debian/patches/resync_rules_base.diff | 1341 + debian/patches/send-upstream/001_keypad_comma.diff |8 3 files changed, 110 insertions(+), 1245 deletions(-) New commits: commit a5ce917b3c77fb9f542fe34a729af44cd2e63abf Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Tue Sep 18 17:17:07 2007 +0200 Refresh diff --git a/debian/patches/send-upstream/001_keypad_comma.diff b/debian/patches/send-upstream/001_keypad_comma.diff index fc08214..5a27cee 100644 --- a/debian/patches/send-upstream/001_keypad_comma.diff +++ b/debian/patches/send-upstream/001_keypad_comma.diff @@ -1,7 +1,7 @@ Index: xkb-data/rules/base.o_s.part === xkb-data.orig/rules/base.o_s.part 2007-09-14 19:19:09.0 +0200 -+++ xkb-data/rules/base.o_s.part 2007-09-14 19:20:40.0 +0200 +--- xkb-data.orig/rules/base.o_s.part 2007-09-18 17:03:25.0 +0200 xkb-data/rules/base.o_s.part 2007-09-18 17:03:37.0 +0200 @@ -66,6 +66,7 @@ keypad:legacy_wang =+keypad(legacy_wang) keypad:oss_wang = +keypad(oss_wang) @@ -12,8 +12,8 @@ Index: xkb-data/rules/base.o_s.part nbsp:level3 = +nbsp(level3) Index: xkb-data/rules/base.xml.in === xkb-data.orig/rules/base.xml.in2007-09-14 19:19:09.0 +0200 -+++ xkb-data/rules/base.xml.in 2007-09-14 19:20:40.0 +0200 +--- xkb-data.orig/rules/base.xml.in2007-09-18 17:03:25.0 +0200 xkb-data/rules/base.xml.in 2007-09-18 17:03:37.0 +0200 @@ -3618,6 +3618,12 @@ /option option commit 9dbac548bbd4b6122e40b9c9f93259ba0bcc728d Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Tue Sep 18 17:16:19 2007 +0200 Clean debian/patches/resync_rules_base.diff. (Closes: #442942) diff --git a/debian/changelog b/debian/changelog index 8ed8a36..cb25022 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xkeyboard-config (1.0~cvs.20070916-2) UNRELEASED; urgency=low + + * Refresh resync_rules_base.diff. (Closes: #442942) + + -- Mohammed Adnène Trojette [EMAIL PROTECTED] Tue, 18 Sep 2007 16:54:39 +0200 + xkeyboard-config (1.0~cvs.20070916-1) unstable; urgency=low * New upstream CVS snapshot from September 16th 2007: diff --git a/debian/patches/resync_rules_base.diff b/debian/patches/resync_rules_base.diff index 62ba800..950356f 100644 --- a/debian/patches/resync_rules_base.diff +++ b/debian/patches/resync_rules_base.diff @@ -18,1274 +18,133 @@ quilt refresh --sort exit 0 -Index: xkb-data/rules/base.lst -=== xkb-data.orig/rules/base.lst 2007-09-14 19:20:30.0 +0200 -+++ /dev/null 1970-01-01 00:00:00.0 + -@@ -1,604 +0,0 @@ --! model -- pc101 Generic 101-key PC -- pc102 Generic 102-key (Intl) PC -- pc104 Generic 104-key PC -- pc105 Generic 105-key (Intl) PC -- dell101 Dell 101-key PC -- latitudeDell Latitude series laptop -- dellm65 Dell Precision M65 -- everex Everex STEPnote -- flexpro Keytronic FlexPro -- microsoft Microsoft Natural -- omnikey101 Northgate OmniKey 101 -- winbook Winbook Model XP5 -- jp106 Japanese 106-key -- pc98PC-98xx Series -- a4techKB21 A4Tech KB-21 -- a4techKBS8 A4Tech KBS-8 -- a4_rfkb23 A4Tech Wireless Desktop RFKB-23 -- abnt2 Brazilian ABNT2 -- airkey Acer AirKey V -- acpiACPI Standard -- azonaRF2300 Azona RF2300 wireless Internet Keyboard -- scorpiusAdvance Scorpius KI -- brother Brother Internet Keyboard -- btc5113rf BTC 5113RF Multimedia -- btc5126tBTC 5126T -- btc9000 BTC 9000 -- btc9000aBTC 9000A -- btc9001ah BTC 9001AH -- btc5090 BTC 5090 -- btc9019uBTC 9019U -- cherryblue Cherry Blue Line [EMAIL PROTECTED] -- cherryblueb Cherry CyMotion Master XPress -- cherrybluea Cherry Blue Line [EMAIL PROTECTED] (alternate option) -- cherrycyboard Cherry [EMAIL PROTECTED] USB-Hub -- chicony Chicony Internet Keyboard -- chicony9885 Chicony KB-9885 -- compaqeak8 Compaq Easy Access Keyboard -- compaqik7 Compaq Internet Keyboard (7 keys) -- compaqik13 Compaq Internet Keyboard (13 keys) -- compaqik18 Compaq Internet Keyboard (18 keys) -- cymotionlinux Cherry CyMotion Master Linux -- armada Laptop/notebook Compaq (eg. Armada) Laptop Keyboard -- presarioLaptop/notebook Compaq (eg. Presario) Internet Keyboard -- ipaqCompaq iPaq Keyboard -- dellDell -- dellusbmm Dell USB Multimedia Keybard -- inspironDell
Bug#442479: XKB layout setting ignored with evdev keyboard driver
On Sun, Sep 16, 2007, Markus Schoder wrote:
Package: xkb-data
Version: 1.0~cvs.20070914-1
Severity: normal
The keyboard layout specified in xorg.conf (in my case de) with the
XkbLayout option is ignored. Instead I get what I think is the us
layout.
I get the following error message in the Xorg log:
(WW) Couldn't load XKB keymap, falling back to pre-XKB keymap
The problem as well as the message disappear if I either switch to the
old version of /usr/share/X11/xkb/keycodes/evdev or change the minimum
keycode setting back to 8 and remove the keycode mappings below 8.
Just changing the minimum back to 1 will trigger the problem again.
Please could you try the following patch?
Index: evdev
===
--- evdev 2 Sep 2007 20:45:27 - 1.8
+++ evdev 14 Sep 2007 22:12:48 - 1.9
@@ -1,7 +1,7 @@
// translation from evdev scancodes to something resembling xfree86 keycodes.
default xkb_keycodes evdev {
- minimum = 1;
+ minimum = 8;
maximum = 255;
# Added for pc105 compatibility
@@ -279,12 +279,12 @@
I253 = 253; // #define KEY_DISPLAY_OFF 245
// Fake keycodes for virtual keys
- MDSW = 1;
- LVL3 = 2;
- ALT = 3;
- META = 4;
- SUPR = 5;
- HYPR = 6;
+ LVL3 = 92;
+ MDSW = 203;
+ ALT = 204;
+ META = 205;
+ SUPR = 206;
+ HYPR = 207;
indicator 1 = Caps Lock;
indicator 2 = Num Lock;
--
Mohammed Adnène Trojette
Bug#404596: gvorak layout
On Thu, Mar 22, 2007, Antonis Antoniadis wrote: I am sorry, here there is the layout Hi Antonis, I've forwarded your request to upstream. Please see https://bugs.freedesktop.org/show_bug.cgi?id=11521. # --- Comment #1 From Sergey V. Udaltsov 2007-07-10 08:33:17 PST [reply] --- # # Unfortunately your layout is not in format acceptable by XKB. Could you please # have a look at, say, symbols/ge and contribute something compatible with XKB # format. Thanks. -- Mohammed Adnène Trojette
Bug#259632: xkb: Unitek KB-2125 multimedia keys not supported
On Thu, Jul 15, 2004, Nicolas DEGAND wrote: The multimedia keys of the keyboard are not recognized. I have collected their names with xev, but do not know how to implement them : Hi Nicolas, I've forwarded your bug report to upstream. Please see https://bugs.freedesktop.org/show_bug.cgi?id=11520 # --- Comment #1 From Sergey V. Udaltsov 2007-07-10 06:30:03 PST [reply] --- # # Look at the file symbols/inet, you'll find a number of definitions similar to # the one you need. They are using the keycodes defined in keycodes/xfree86. # # So, looking forward to getting a patch for symbols/inet from you;) -- Mohammed Adnène Trojette
xkb-data: Changes to 'debian-unstable'
debian/geometry.dir |9 + debian/keycodes.dir |1 debian/semantics.dir |4 ++ debian/symbols.dir | 78 +++ 4 files changed, 80 insertions(+), 12 deletions(-) New commits: commit 17b5158b75522ae4a421f06dc501cf9f97052399 Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Fri Sep 14 18:53:58 2007 +0200 Update *.dir files diff --git a/debian/geometry.dir b/debian/geometry.dir index c88d851..4dc29ab 100644 --- a/debian/geometry.dir +++ b/debian/geometry.dir @@ -20,6 +20,15 @@ -d-- everex(STEPnote) -d-- fujitsu(138) fujitsu(140) +h-p- hhk(basic) + hhk(jp1) + hhk(jp2) + hhk(jp3) + hhk(jp4) +-d-- hhk(win1) + hhk(win2) + hhk(win3) + hhk(win4) hp(hil) hp(omnibook) hp(omnibook_intl) diff --git a/debian/keycodes.dir b/debian/keycodes.dir index 2f124f2..40daf42 100644 --- a/debian/keycodes.dir +++ b/debian/keycodes.dir @@ -37,7 +37,6 @@ macintosh(goodmap) -d-- macintosh(macintosh) macintosh(old) --d-- powerpcps2(powerpcps2) -d-- sgi_vndr/indigo(pc101) sgi_vndr/indigo(pc102) sgi_vndr/indy(jp106) diff --git a/debian/semantics.dir b/debian/semantics.dir new file mode 100644 index 000..3f796b8 --- /dev/null +++ b/debian/semantics.dir @@ -0,0 +1,4 @@ +-d-- basic(basic) +-d-- complete(complete) +-d-- default(default) +-d-- xtest(xtest) diff --git a/debian/symbols.dir b/debian/symbols.dir index d00ea69..e25bbfa 100644 --- a/debian/symbols.dir +++ b/debian/symbols.dir @@ -4,6 +4,7 @@ --p- a--- af(uz) -dp- a--- al(basic) --p- -m-- altwin(alt_super_win) +--p- -m-- altwin(ctrl_win) --p- -m-- altwin(hyper_win) --p- -m-- altwin(left_meta_win) --p- -m-- altwin(menu) @@ -15,6 +16,7 @@ --p- a--- am(eastern) --p- a--- am(eastern-alt) am(phonetic) +--p- a--- am(phonetic-alt) --p- a--- am(western) --p- a--- ara(azerty) --p- a--- ara(azerty_digits) @@ -42,6 +44,10 @@ --p- a--- bg(phonetic) -d-- br(abnt2) --p- a--- br(nodeadkeys) +-dp- a--- braille(home_row) +h-p- --k- braille(keypad) +--p- a--- braille(left_hand) +--p- a--- braille(right_hand) -dp- a--- bt(basic) -dp- a--- by(basic) --p- a--- by(latin) @@ -137,6 +143,7 @@ h-p- a--- cs(twoletter) --p- a--- ee(dvorak) --p- a--- ee(nodeadkeys) -dp- a--- epo(basic) +--p- a--- epo(legacy) --p- a--- es(Sundeadkeys) -dp- a--- es(basic) --p- a--- es(cat) @@ -144,12 +151,13 @@ h-p- a--- cs(twoletter) --p- a--- es(mac) --p- a--- es(nodeadkeys) --p- a--- es(sundeadkeys) +-dp- a--- et(basic) --p- eurosign(2) --p- eurosign(5) --p- eurosign(e) -dp- a--- fi(basic) --p- a--- fi(fi) ---p- a--- fi(kotoistus) + fi(kotoistus) --p- a--- fi(mac) --p- a--- fi(nodeadkeys) fi(smi) @@ -157,6 +165,8 @@ h-p- a--- cs(twoletter) --p- a--- fo(nodeadkeys) --p- a--- fr(Sundeadkeys) -dp- a--- fr(basic) +--p- a--- fr(bepo) +--p- a--- fr(bepo_latin9) --p- a--- fr(dvorak) --p- a--- fr(latin9) --p- a--- fr(latin9_Sundeadkeys) @@ -176,8 +186,12 @@ h-p- a--- cs(twoletter) --p- a--- gb(dvorak) --p- a--- gb(intl) --p- a--- gb(mac) +--p- a--- ge(azerty_tskapo) -dp- a--- ge(basic) ---p- a--- ge(la) +--p- a--- ge(ergonomic) +--p- a--- ge(mess) +--p- a--- ge(os) +--p- a--- ge(qwerty) --p- a--- ge(ru) --p- a--- gh(akan) -dp- a--- gh(basic) @@ -199,6 +213,7 @@ h-p- a---g--- gr(bare) --p- -m-- group(ctrl_shift_toggle) --p- -m-- group(ctrls_toggle) --p- -m-- group(lalt_toggle) +--p- -m-- group(lctrl_lshift_toggle) --p- -m-- group(lctrl_toggle) --p- -m-- group(lshift_toggle) --p- -m-- group(lswitch) @@ -256,10 +271,12 @@ h-p- a--- hu(def_qwertz) --p- a--- ie(ogam) --p- a--- ie(ogam_is434) -dp- a--- il(basic) +--p- a--- il(biblical) --p- a--- il(lyx) --p- a--- il(phonetic) --p- a--- in(ben) in(ben_probhat) +--p- a--- in(bolnagri) -dp- a--- in(deva) --p- a--- in(guj) --p- a--- in(guru) @@ -283,6 +300,8 @@
xkb-data: Changes to 'debian-unstable'
symbols/cn | 154 +
symbols/gn | 63
2 files changed, 217 insertions(+)
New commits:
commit ae80b0a5fb83de76a10ec3aa62896b3e76e6243a
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Fri Sep 14 19:14:39 2007 +0200
releasing version 1.0~cvs.20070914-1
diff --git a/symbols/cn b/symbols/cn
new file mode 100644
index 000..f477190
--- /dev/null
+++ b/symbols/cn
@@ -0,0 +1,154 @@
+// $XKeyboardConfig: xkeyboard-config/symbols/cn,v 1.1 2007-08-22 21:52:47
uid2570 Exp $
+//
+
+//
+// Default Chinise is the same as American
+//
+partial default alphanumeric_keys
+xkb_symbols basic {
+include us(basic)
+
+name[Group1]= China;
+};
+
+// Tibetan Standard Keyboard map for XKB/X.org
+//
+// Based on the CNS Tibetan keyboard as supported by Windows Vista
+// using information published by Tashi Tsering:
+// http://www.yalasoo.com/English/docs/yalasoo_en_MStbKb.html
+//
+// XKB version by Rich Felker [EMAIL PROTECTED].
+//
+// The CNS Tibetan keyboard standard specifies 5 keyboards worth of keys,
+// but apparently makes no requirements about how each is accessed. Only
+// the first 2 are needed for native Tibetan text; the remainder are
+// filled with special symbols and letters for transliterating foreign
+// text. Further, CNS leaves the level of support of keyboards 2-5 as an
+// option to the implementor (despite the fact that #2 is absolutely
+// essential...). Windows Vista maps them as follows:
+//
+// 1. Unshifted
+// 2. m-key-prefixed
+// 3. Shift-modified
+// 4. Ctrl+Alt+Shift-modified
+// 5. M-key-prefixed
+//
+// I roughly copy the Windows Vista mapping, which was intended by the
+// designer of the keyboard, with the following exceptions:
+//
+// The fifth keyboard is almost empty and contains only precomposed forms
+// of subjoined letter characters whose use is strongly discouraged, and
+// is not implemented at all in this XKB map. The fourth is implemented,
+// but is accessed by an m-prefix (or M-prefix, for convenience)
+// followed by a Shift-modified key. This avoids stealing the Ctrl and Alt
+// keys, which belong to applications on *nix and not to the keyboard or
+// input method. Aside from enterring rare special symbols and
+// foreign-word-transliteration letters, these differences should not
+// affect users.
+//
+// Implementation notes:
+//
+// A latching ISO Level3 shift is used for the m-prefix modifier. In
+// principle moving it to other keys (e.g. AltGr) would be possible
+// according to user preference, but this is not practical for typing
+// Tibetan, since the subjoined consonants, of which Tibetan has 0-2 per
+// syllable, are accessed via this mechanism.
+//
+// One annoyance is that the latching Level3 shift fails to work if the
+// previous key is not yet released when m is pressed (the key release
+// event kills the latch). I consider this a bug in X and don't know an
+// easy way to work around it. Complain to the maintainers if it bothers
+// you and maybe they'll find a fix. You won't notice it unless you're
+// fast at typing Tibetan anyway.
+
+partial alphanumeric_keys
+xkb_symbols tib {
+
+name[Group1]= China - Tibetan;
+
+key TLDE { [ 0x1000f68, 0x1000f01, 0x1000fb8, 0x1000f00 ] }; # ཨ ༁ ྸ ༀ
+key AE01 { [ 0x1000f21, 0x1000f2a, 0x1000f04, 0x1000f76 ] }; # ༡ ༪ ༄ ྲྀ
+key AE02 { [ 0x1000f22, 0x1000f2b, 0x1000f05, 0x1000f77 ] }; # ༢ ༫ ༅ ཷ
+key AE03 { [ 0x1000f23, 0x1000f2c, 0x1000f7e, 0x1000f78 ] }; # ༣ ༬ ཾ ླྀ
+key AE04 { [ 0x1000f24, 0x1000f2d, 0x1000f83, 0x1000f79 ] }; # ༤ ༭ ྃ ཹ
+key AE05 { [ 0x1000f25, 0x1000f2e, 0x1000f37, 0x1000f81 ] }; # ༥ ༮ ༷ ཱྀ
+key AE06 { [ 0x1000f26, 0x1000f2f, 0x1000f35, 0x1000f09 ] }; # ༦ ༯ ༵ ༉
+key AE07 { [ 0x1000f27, 0x1000f30, 0x1000f7f, 0x1000f0a ] }; # ༧ ༰ ཿ ༊
+key AE08 { [ 0x1000f28, 0x1000f31, 0x1000f14, 0x1000f0f ] }; # ༨ ༱ ༔ ༏
+key AE09 { [ 0x1000f29, 0x1000f32, 0x1000f11, 0x1000f10 ] }; # ༩ ༲ ༑ ༐
+key AE10 { [ 0x1000f20, 0x1000f33, 0x1000f08, 0x1000f12 ] }; # ༠ ༳ ༈ ༒
+key AE11 { [ 0x1000f67, 0x1000f3c, 0x1000fb7, 0x1000f0c ] }; # ཧ ༼ ྷ ༌
+key AE12 { [ 0x1000f5d, 0x1000f3d, 0x1000fba, 0x1000f13 ] }; # ཝ ༽ ྺ ༓
+
+key AD01 { [ 0x1000f45, 0x1000f15, 0x1000f95, 0x1000f89 ] }; # ཅ ༕ ྕ ྉ
+key AD02 { [ 0x1000f46, 0x1000f16, 0x1000f96, 0x1000f88 ] }; # ཆ ༖ ྖ ྈ
+key AD03 { [ 0x1000f7a, 0x1000f17, 0x1000f7b, 0x1000fbe ] }; # ེ ༗ ཻ ྾
+key AD04 { [ 0x1000f62, 0x1000fbc, 0x1000fb2, 0x1000f6a ] }; # ར ྼ ྲ ཪ
+key AD05 { [ 0x1000f4f, 0x1000f4a, 0x1000f9f, 0x1000f9a ] }; # ཏ ཊ ྟ ྚ
+key AD06 { [ 0x1000f61, 0x1000fbb, 0x1000fb1, 0x1000fbf ] }; # ཡ ྻ ྱ ྿
+key AD07 { [ 0x1000f74, 0x1000f18, 0x1000fad, 0x1000f75 ] }; # ུ ༘ ྭ ཱུ
+key AD08 { [ 0x1000f72, 0x1000f19, 0x1000f80, 0x1000f73 ] }; # ི ༙ ྀ ཱི
+key AD09 { [ 0x1000f7c, 0x1000f1a, 0x1000f7d, 0x1000fc0 ] }; # ོ ༚ ཽ ࿀
+key AD10 { [ 0x1000f55, 0x1000f1b, 0x1000fa5, 0x1000fc1 ] }; # ཕ ༛ ྥ ࿁
+key
xkb-data: Changes to 'debian-unstable'
://bugs.freedesktop.org/show_bug.cgi?id=11955
+
+2007-08-14 Sergey Udaltsov
+
+ * symbols/inet, rules/base.xml.in: added asus_laptop,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11936
+
+2007-08-12 Sergey Udaltsov
+
+ * symbols/ru: fixed ebreve in ru(ch),
+ http://bugs.freedesktop.org/show_bug.cgi?id=11246
+ * rules/base.xml.in: missing Romanian variants added,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11945
+
+2007-08-10 Sergey Udaltsov
+
+ * symbols/br, rules/base.m_g.part, rules/base.ml1_s.part,
+ rules/base.ml_g.part, rules/base.ml_s.part: Adding br(thinkpad),
+ polishing rules a bit,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11908
+
+2007-08-07 Sergey Udaltsov
+
+ * symbols/ara: Patch to Arabic keyboard layout,
+ http://bugs.freedesktop.org/show_bug.cgi?id=11867
+
+2007-08-03 Sergey Udaltsov
+
+ * symbols/us, rules/base.xml.in: added us(altgr-intl), closing
+ http://bugs.freedesktop.org/show_bug.cgi?id=11753
+
+2007-07-30 Sergey Udaltsov
+
+ * symbols/inet, rules/base.lists.part, rules/base.m_s.part,
+ rules/base.xml.in: introduced media_common, some Dell/Logitech symbols
+ are dead, compatibility rules created, Acer kbds consolidated,
+ http://bugs.freedesktop.org/show_bug.cgi?id=11746
+
+2007-07-25 Sergey Udaltsov
+
+ * symbols/inet, rules/base.lists.part, rules/base.m_s.part,
+ rules/base.xml.in: consolidating benq keyboards,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11713
+
+2007-07-24 Sergey Udaltsov
+
+ * symbols/gn, symbols/Makefile.am, rules/base.xml.in: added Guinea,
+ http://bugs.freedesktop.org/show_bug.cgi?id=11702
+
+2007-07-23 Sergey Udaltsov
+
+ * symbols/cd: update Congolese,
+ https://bugs.freedesktop.org/show_bug.cgi?id=5500
+
+2007-07-22 Sergey Udaltsov
+
+ * symbols/inet, rules/base.lists.part, rules/base.xml.in: adding
+ logiex110 model, https://bugs.freedesktop.org/show_bug.cgi?id=11686
+
2007-07-20 Sergey Udaltsov
* symbols/gr: adding pound sign,
@@ -1548,7 +1675,7 @@
2004-09-13 22:39 svu
- * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.302 2007-07-20 23:30:14 svu Exp $
+ * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.329 2007-09-05 23:10:13 svu Exp $
2004-09-13 22:38 svu
diff --git a/debian/changelog b/debian/changelog
index 6ef39da..d2ed552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xkeyboard-config (1.0~cvs.20070914-1) unstable; urgency=low
+
+ * New upstream CVS snapshot from September 14th 2007:
+ + advertise all Romanian layouts. Thanks Eddy Petrișor for the
+ patch. (Closes: #436993)
+ + fix ctrl:swapcaps. (Closes: #410060)
+ + add missing virtual keys from evdev keycodes. Thanks Yann
+ Vernier for the patch. (Closes: #432613)
+ + support Asus 6000 series laptop keyboard. Thanks Arnout Boelens
+ for the patch. (Closes: #383953)
+ * Update debian/*.dir files.
+
+ -- Mohammed Adnène Trojette [EMAIL PROTECTED] Fri, 14 Sep 2007 19:12:27
+0200
+
xkeyboard-config (1.0~cvs.20070721-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/docs/README.enhancing b/docs/README.enhancing
index 272b201..5e68492 100644
--- a/docs/README.enhancing
+++ b/docs/README.enhancing
@@ -309,12 +309,12 @@ The most used schemes are:
Besides that, there are several schemes for special purposes:
- PC_BREAK
+ PC_CONTROL_LEVEL2
It is similar to TWO_LEVEL scheme but it considers the Control
modifier rather than Shift. That means, the symbol from the sec-
ond level is chosen by Control rather than by Shift.
- PC_SYSRQ
+ PC_ALT_LEVEL2
It is similar to TWO_LEVEL scheme but it considers the Alt modi-
fier rather than Shift. That means, the symbol from the second
level is chosen by Alt rather than by Shift.
diff --git a/geometry/dell b/geometry/dell
index 3700832..76f135e 100644
--- a/geometry/dell
+++ b/geometry/dell
@@ -181,3 +181,362 @@ default xkb_geometry dell101 {
alias AA00 = LCTL;
}; // End of default geometry
+
+
+xkb_geometry dell65 {
+};
+
+xkb_geometry dell65x {
+
+description= Dell 101;
+width= 470;
+height= 210;
+color=grey10;
+
+shape.cornerRadius= 1;
+shape NORM { { [ 18,18] }, { [2,1], [ 16,16] } };
+shape BKSP { { [ 38,18] }, { [2,1], [ 36,16] } };
+shape TABK { { [ 28,18] }, { [2,1], [ 26,16] } };
+shape BKSL { { [ 28,18] }, { [2,1], [ 26,16] } };
+shape RTRN { { [ 42,18] }, { [2,1], [ 40,16] } };
+shape CAPS { { [ 33,18] }, { [ 28,18] }, { [2,1], [ 26,16] } };
+shape LFSH { { [ 42,18] }, { [2,1], [ 40,16] } };
+shape RTSH { { [ 52,18] }, { [2,1], [ 50,16] } };
+shape MODK { { [ 27,18] }, { [2,1], [ 25,16] } };
+shape SPCE { { [133,18] }, { [2,1], [131,16] } };
+shape KP0
xkb-data: Changes to 'debian-unstable'
debian/patches/mac_poweroff.diff |8
debian/patches/resync_rules_base.diff | 1732 -
debian/patches/sclk_toggle.diff| 16
debian/patches/send-upstream/001_keypad_comma.diff | 38
debian/patches/unhide_lv3_enter_switch.diff| 16
5 files changed, 1071 insertions(+), 739 deletions(-)
New commits:
commit a823fb6079718e2108de39c21f2d3070f9bec6b9
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Fri Sep 14 20:46:06 2007 +0200
Refresh patches
diff --git a/debian/patches/mac_poweroff.diff b/debian/patches/mac_poweroff.diff
index 6d3f133..1763877 100644
--- a/debian/patches/mac_poweroff.diff
+++ b/debian/patches/mac_poweroff.diff
@@ -1,11 +1,11 @@
Add the power key, as requested by Jörg Sommer in
http://lists.debian.org/debian-powerpc/2006/09/msg00227.html
-Index: xkb-data-experimental/symbols/inet
+Index: xkb-data/symbols/inet
===
xkb-data-experimental.orig/symbols/inet
-+++ xkb-data-experimental/symbols/inet
-@@ -2261,6 +2261,7 @@
+--- xkb-data.orig/symbols/inet 2007-09-14 19:16:52.0 +0200
xkb-data/symbols/inet 2007-09-14 19:17:35.0 +0200
+@@ -2025,6 +2025,7 @@
key I2E { [ XF86AudioLowerVolume ] };
key I30 { [ XF86AudioRaiseVolume ] };
key I56 { [ XF86RotateWindows ] };
diff --git a/debian/patches/resync_rules_base.diff
b/debian/patches/resync_rules_base.diff
index f530d28..62ba800 100644
--- a/debian/patches/resync_rules_base.diff
+++ b/debian/patches/resync_rules_base.diff
@@ -18,470 +18,1046 @@
quilt refresh --sort
exit 0
-Index: xkb-data/rules/base
+Index: xkb-data/rules/base.lst
===
xkb-data.orig/rules/base 2007-07-21 20:04:00.0 +0200
-+++ xkb-data/rules/base2007-07-21 20:04:12.0 +0200
-@@ -141,116 +141,116 @@
- * = pc(pc104)
-
- ! model layout variant = symbols
-- * ben basic = pc+in(ben)
-- * ben probhat = pc+in(ben_probhat)
-- * dev basic = pc+in(deva)
-- * dvorak $dvoraklayouts = pc+%l(dvorak)
-- * dvorak basic = pc+us(dvorak)
-- * dvorak pl_basic= pc+pl(dvorak)
-- * dvorak pl = pc+pl(dvorak_quotes)
-- * dvorak pl_altquotes=
pc+pl(dvorak_altquotes)
-- * dzdwi basic = pc+bt(basic)
-- * guj basic = pc+in(guj)
-- * gur basic = pc+in(guru)
-- * ie laptop = pc+ie(basic)
-- * ie CloGaelachLaptop=
pc+ie(CloGaelach)
-- * il si1452 = pc+ie(basic)
-- * iu basic = pc+ca(ike)
-- * lo basic = pc+la(basic)
-- * kan basic = pc+in(kan)
-- * mal basic = pc+in(mal)
-- * mal mlplusnum = pc+in(mal)
-- * ogham basic = pc+ie(ogam)
-- * ogham laptop = pc+ie(ogam)
-- * ogham is434 = pc+ie(ogam_is434)
-- * ogham is434laptop =
pc+ie(ogam_is434)
-- * ori basic = pc+in(ori)
-- * ro de = pc+ro(winkeys)
-- * ro us = pc+ro(std)
-- * sapmi basic = pc+no(smi)
-- * sapmi nodeadkeys =
pc+no(smi_nodeadkeys)
-- * sapmi sefi= pc+fi(smi)
-- * sin phonetic-static =
pc+in(sin_phonetic)
-- * syr basic = pc+sy(syc)
-- * syr phonetic=
pc+sy(syc_phonetic)
-- * tam INSCRIPT= pc+in(tam)
-- * tam UNI = pc+in(tam_unicode)
-- * tam TAB = pc+in(tam_TAB)
-- * tam TSCII = pc+in(tam_TSCII)
-- * tel basic = pc+in(tel)
-- * yu basic = pc+srp(latin)
-- * yu unicode = pc+srp(latinunicode)
-- * yu
Bug#425655: xkb-data: Media key symbols for Logitech UltraX keyboard
tag 425655 moreinfo thanks On Tue, May 22, 2007, Larry Lade wrote: A couple things to note: a) The E-Mail key on this keyboard variously reports keycodes 120 and 236. I am not yet clear what causes this change. I've mapped both codes to XF86Mail. b) I'm not sure why, but it still seems necessary to include the Logitech defaults first to get these keys initialized. b) It seems possible there are a number of keyboards floating around branded as Logitech Ultra-X. Mine is labelled: Hi, upstream followed up on https://bugs.freedesktop.org/show_bug.cgi?id=11518 He has a question for you: I see your point regarding Email. But I do not really understand the difference between HomePage and WWW in this context. Could you please give a bit more details - why is it so essential for you? Anyway, shortcuts can be bound to any of these keysyms. -- Mohammed Adnène Trojette
Bug#421189: Remove/merge redundant dvorak file
tag 421189 moreinfo thanks On Fri, Apr 27, 2007, Andrew Sayers wrote: I've encountered an obscure bug that occurs in dvorak(gb) but not gb(dvorak). When I'm using the Beryl window manager, holding down the alt key causes the active window to lose the focus. I've tried several other WMs and can't replicate it outside Beryl. The dvorak file has (largely) compatible equivalents in the respective national keyboard layouts, so having a specific dvorak file is confusing to users and leads to inconsistencies like the above - if it's really important that both exist, could you make dvorak($lang) just include the settings from $lang(dvorak)? Do yo reproduce this bug with the version in unstable? -- Mohammed Adnène Trojette
Bug#410060: xkb-data: ctrl:swapcaps doesn't work (fully) correctly
tag 410060 moreinfo thanks On Fri, Feb 09, 2007, Peter Baumann wrote: I could reproduce this behaviour on a etch machine at the university having a session which only starts xev and no windowmanager. I get no output for Caps_Lock+Alt+1 there, too. Please could you follow up on https://bugs.freedesktop.org/show_bug.cgi?id=11516? Sergey V. Udaltsov asked: If you output your XKB configuration using xkbcomp :0 -xkb out.xkb - is there any difference in mapping between keys 1 and 2? -- Mohammed Adnène Trojette
Bug#355822: xkb: some multimedia sends events forever once pressed
On Thu, May 03, 2007, Gilles Grandou wrote: Hi Mohammed, Hi, upstream commented on your bug on https://bugs.freedesktop.org/show_bug.cgi?id=11515: It looks to me like a bug in the keyboard driver (X or kernel). The key should not endlessly generate X events when it is not actually pressed (do I understand you right?) -- Mohammed Adnène Trojette
xkb-data: Changes to 'debian-unstable'
| 39
symbols/vn
|2
symbols/xfree68_vndr/Makefile.in
| 22
symbols/za
|2
types/Makefile.in
| 24
types/complete
|2
types/default
|2
types/level5
|2
types/types.dir
| 14
xkbrules.am
|3
xkeyboard-config.spec
|2
xkeyboard-config.spec.in
|2
276 files changed, 26073 insertions(+), 26109 deletions(-)
New commits:
commit 0d6c6efdb89df678812020c4c9dfac9bbc9eaa7a
Author: Julien Cristau [EMAIL PROTECTED]
Date: Sun Jun 3 18:33:04 2007 +0200
Fix watch file.
diff --git a/debian/changelog b/debian/changelog
index 0617d7e..6867400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,10 @@ xkeyboard-config (0.9+cvs.20070428-2) UNRELEASED; urgency=low
* Patches backported from upstream:
+ 001_fix_us.diff: fix us layout. (Closes: #421532)
- -- Mohammed Adnène Trojette [EMAIL PROTECTED] Mon, 30 Apr 2007 00:12:26
+0200
+ [ Julien Cristau ]
+ * Fix watch file to look for tarballs at http://xlibs.fd.o/xkbdesc/
+
+ -- Mohammed Adnène Trojette [EMAIL PROTECTED] Sun, 03 Jun 2007 18:32:13
+0200
xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low
diff --git a/debian/watch b/debian/watch
index 17286c6..9f7c7f0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://xorg.freedesktop.org/releases/individual/data/ xkbdata-(.*)\.tar\.gz
+http://xlibs.freedesktop.org/xkbdesc/ xkeyboard-config-(.*)\.tar\.gz
commit a89c54aa311859687e618b7ab2de1c45b1ea736c
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Mon Apr 30 00:20:08 2007 +0200
Fix US layout (001_fix_us_layout.diff)
+ Debian bug #421532
+ X.org bugs #8789 and #10811
Add keypad:comma (001_keypad_comma.diff)
+ Debian bug #409117 to forward
Add Asus 6000 series laptop layout
+ Debian bug #383953 to forward
diff --git a/debian/changelog b/debian/changelog
index 32b5e83..0617d7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xkeyboard-config (0.9+cvs.20070428-2) UNRELEASED; urgency=low
+
+ * Patches to send upstream.
+ + 002_add_asus6000.diff: add Asus A6000 series Keyboard
+ support. (Closes: #383953)
+ * Patches backported from upstream:
+ + 001_fix_us.diff: fix us layout. (Closes: #421532)
+
+ -- Mohammed Adnène Trojette [EMAIL PROTECTED] Mon, 30 Apr 2007 00:12:26
+0200
+
xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low
* Add myself to Uploaders. (Closes: #401777)
@@ -8,7 +18,6 @@ xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low
+ fix keymap on iBook G4 Japanese keyboard. (Closes: #374070)
+ fix K6C key in symbols/inet. (Closes: #409982)
+ update Finnish layout. (Closes: #405207)
- + add Logitech Media Elite keyboard support. (Closes: #384801)
+ add Logitech Cordless Desktop Optical support. (Closes: #391192)
+ fix a jp106 backslash/yen issue. (Closes: #280579)
* Patches refreshed:
diff --git a/debian/patches/backports/001_fix_us_layout.diff
b/debian/patches/backports/001_fix_us_layout.diff
new file mode 100644
index 000..debcb66
--- /dev/null
+++ b/debian/patches/backports/001_fix_us_layout.diff
@@ -0,0 +1,18 @@
+Index: xkb-data-experimental/symbols/us
+===
+--- xkb-data-experimental.orig/symbols/us
xkb-data-experimental/symbols/us
+@@ -61,6 +61,8 @@
+ key AB09 { [period,greater ] };
+ key AB10 { [ slash,question] };
+
++key BKSL { [ backslash, bar] };
++key CAPS { [ Caps_Lock ] };
+ // End alphanumeric section
+ };
+
+@@ -507,4 +509,3 @@
+ include us
+ name[Group1]= U.S. English - Macintosh;
+ };
+-
diff --git a/debian/patches/send-upstream/001_keypad_comma.diff
b/debian/patches/send-upstream/001_keypad_comma.diff
index 90b610f..9393376 100644
--- a/debian/patches/send-upstream/001_keypad_comma.diff
+++ b/debian/patches/send-upstream/001_keypad_comma.diff
@@ -2,7 +2,7 @@ Index: xkb-data-experimental/rules/base
xkb-data: Changes to 'debian-unstable'
ChangeLog | 110 + NEWS |1 configure | 20 +- configure.in |2 debian/changelog | 22 +- geometry/Makefile.am |2 geometry/Makefile.in |2 geometry/hhk | 268 rules/base| 15 + rules/base.lists.part |2 rules/base.lst| 119 -- rules/base.m_g.part |1 rules/base.o_s.part | 12 + rules/base.xml.in | 378 -- rules/xfree98 |6 rules/xkb.dtd |4 symbols/Makefile.am |8 symbols/Makefile.in |8 symbols/be| 25 --- symbols/br|4 symbols/braille | 62 +++ symbols/ch|4 symbols/cs|4 symbols/de|6 symbols/dk|6 symbols/ee|4 symbols/et| 67 symbols/fi|6 symbols/ge| 12 + symbols/gr| 11 - symbols/hu| 18 +- symbols/il|4 symbols/in| 80 + symbols/it|4 symbols/jp| 14 + symbols/keypad| 216 +- symbols/kpdl | 88 ++ symbols/lk| 35 +--- symbols/macintosh_vndr/ch |4 symbols/macintosh_vndr/de |2 symbols/macintosh_vndr/it |2 symbols/macintosh_vndr/se |2 symbols/mk|4 symbols/nl|4 symbols/no|4 symbols/pl| 10 - symbols/ro|4 symbols/ru| 64 +++ symbols/se|8 symbols/us| 71 xkeyboard-config.spec |2 51 files changed, 1557 insertions(+), 274 deletions(-) New commits: commit c85f1c5d3311499ac4e352b9bf1ad7199ee42043 Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sat Jul 21 19:49:01 2007 +0200 New upstream CVS snapshot * New upstream CVS snapshot from July 21st 2007: + include xkb files for the Happy Hacking keyboard. (Closes: #167370) + fix us layout. (Closes: #421532) + fix se layout. (Closes: #425304) + fix de+nodeadkey layout. (Closes: #432297) * Patches refreshed: + fix FTBFS. (Closes: #424112) * Patches to send upstream. + 002_add_asus6000.diff: add Asus A6000 series Keyboard support. (Closes: #383953) diff --git a/debian/changelog b/debian/changelog index 6867400..3f872d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,21 @@ -xkeyboard-config (0.9+cvs.20070428-2) UNRELEASED; urgency=low - - * Patches to send upstream. - + 002_add_asus6000.diff: add Asus A6000 series Keyboard - support. (Closes: #383953) - * Patches backported from upstream: - + 001_fix_us.diff: fix us layout. (Closes: #421532) +xkeyboard-config (1.0~cvs.20070721-1) UNRELEASED; urgency=low [ Julien Cristau ] * Fix watch file to look for tarballs at http://xlibs.fd.o/xkbdesc/ - -- Mohammed Adnène Trojette [EMAIL PROTECTED] Sun, 03 Jun 2007 18:32:13 +0200 + [ Mohammed Adnène Trojette ] + * New upstream CVS snapshot from July 21st 2007: + + include xkb files for the Happy Hacking keyboard. (Closes: #167370) + + fix us layout. (Closes: #421532) + + fix se layout. (Closes: #425304) + + fix de+nodeadkey layout. (Closes: #432297) + * Patches refreshed: + + fix FTBFS. (Closes: #424112) + * Patches to send upstream. + + 002_add_asus6000.diff: add Asus A6000 series Keyboard support. + (Closes: #383953) + + -- Mohammed Adnène Trojette [EMAIL PROTECTED] Sat, 21 Jul 2007 19:42:15 +0200 xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low commit 06770dd5e82baaacfe265f7ef61aa62844b82fde Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sat Jul 21 19:40:17 2007 +0200 New upstream CVS snapshot diff --git a/ChangeLog b/ChangeLog index 38d3702..cfd027d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,111 @@ +2007-07-20 Sergey Udaltsov + + * symbols/gr: adding pound sign, + https://bugs.freedesktop.org/show_bug.cgi?id=11608 + +2007-07-16 Sergey Udaltsov + + * rules/base.o_s.part, rules/base.xml.in, symbols/be, symbols/keypad: + modularized wang kbd, + https://bugs.freedesktop.org/show_bug.cgi?id=8852 + +2007-07-15 Sergey Udaltsov + + * symbols/kpdl, symbols/*, rules/base.xml.in, rules/base.o_s.part: + introducing separate KPDL handling, + https://bugs.freedesktop.org/show_bug.cgi?id=11611 + +2007-07-12 Sergey Udaltsov + + * NEWS: preparing release 1.0 + +2007-07-10 Sergey Udaltsov + + * geometry/hhk, rules/base.m_g.part
xkb-data: Changes to 'debian-unstable'
debian/patches/backports/001_fix_us_layout.diff | 18 --
debian/patches/greek.diff | 24
debian/patches/series |2 --
3 files changed, 44 deletions(-)
New commits:
commit f1b339cc7c96aaea4ac1540416ffb6e16e839c68
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sat Jul 21 19:53:45 2007 +0200
Remove obsolete patch
diff --git a/debian/patches/greek.diff b/debian/patches/greek.diff
deleted file mode 100644
index 16e9c64..000
--- a/debian/patches/greek.diff
+++ /dev/null
@@ -1,24 +0,0 @@
- * debian/patches/greek.diff: New patch to replace dead_horn and
-dead_ogonek by U0313/U0314, which are the correct breathing
-signs for polytonic Greek. This change can be performed now
-that an updated el_GR.UTF-8/Compose file hit testing.
-Closes: #386385 Thanks Jan Willem Stumpel.
-
-Not submitted upstream. This patch can be submitted only when
-el_GR.UTF-8/Compose contains rules with U0313/U0314.
-
-Index: xkb-data/symbols/gr
-===
xkb-data.orig/symbols/gr
-+++ xkb-data/symbols/gr
-@@ -113,8 +113,8 @@
- key AD11 { [dead_tilde, dead_diaeresis, dead_macron ] };
- key AD12 { [dead_iota, VoidSymbol, dead_breve ] };
-
--key AC10 { [dead_acute, dead_horn ] };
--key AC11 { [dead_grave, dead_ogonek ] };
-+key AC10 { [dead_acute, U0313 ] };
-+key AC11 { [dead_grave, U0314 ] };
-
- };
-
diff --git a/debian/patches/series b/debian/patches/series
index 51963c7..f9216f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ mac_poweroff.diff
#bz1576.diff
#bz8668.diff
unhide_lv3_enter_switch.diff
-greek.diff
#compatibility.diff
#japan.diff
resync_rules_base.diff
commit 2e412f22eaa493d0d52b6fcf6b7995c28ae3b050
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Sat Jul 21 19:52:21 2007 +0200
remove obsolete patch
diff --git a/debian/patches/backports/001_fix_us_layout.diff
b/debian/patches/backports/001_fix_us_layout.diff
deleted file mode 100644
index debcb66..000
--- a/debian/patches/backports/001_fix_us_layout.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: xkb-data-experimental/symbols/us
-===
xkb-data-experimental.orig/symbols/us
-+++ xkb-data-experimental/symbols/us
-@@ -61,6 +61,8 @@
- key AB09 { [period,greater ] };
- key AB10 { [ slash,question] };
-
-+key BKSL { [ backslash, bar] };
-+key CAPS { [ Caps_Lock ] };
- // End alphanumeric section
- };
-
-@@ -507,4 +509,3 @@
- include us
- name[Group1]= U.S. English - Macintosh;
- };
--
diff --git a/debian/patches/series b/debian/patches/series
index 9ca176b..51963c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,4 +15,3 @@ greek.diff
resync_rules_base.diff
send-upstream/001_keypad_comma.diff
send-upstream/002_add_asus6000.diff
-backports/001_fix_us_layout.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xkb-data: Changes to 'debian-unstable'
compat/compat.dir | 36 debian/changelog |9 debian/patches/resync_rules_base.diff | 36 debian/patches/sclk_toggle.diff| 22 debian/patches/send-upstream/001_keypad_comma.diff | 58 debian/patches/send-upstream/002_add_asus6000.diff | 1296 - debian/patches/series |2 debian/patches/unhide_lv3_enter_switch.diff| 20 debian/rules |2 docs/README.config |2 geometry/geometry.dir | 126 +- keycodes/keycodes.dir | 129 +- keymap/keymap.dir | 448 +++ rules/base | 435 +++ rules/base.lst |3 rules/base.o_s.part|3 rules/base.xml.in | 18 rules/compat/Makefile.am |7 rules/compat/Makefile.in | 10 rules/compat/base.ml1_s.part | 134 +- rules/compat/base.ml1v1_s.part | 82 - rules/compat/base.ml_s.part| 134 +- rules/compat/base.mlv_s.part | 82 - symbols/group | 12 symbols/inet |1 symbols/level3 |2 symbols/symbols.dir| 1036 types/types.dir| 14 28 files changed, 2713 insertions(+), 1446 deletions(-) New commits: commit e59ec60e5ddc7cfa763f9b0076afe0e969149683 Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sat Jul 21 20:51:12 2007 +0200 releasing version 1.0~cvs.20070721-1 diff --git a/compat/compat.dir b/compat/compat.dir index c04d31e..088c40d 100644 --- a/compat/compat.dir +++ b/compat/compat.dir @@ -1,28 +1,28 @@ --dp- pc(pc) --dp- misc(misc) --d-- pc98(basic) --d-- default(default) --dp- ledscroll(scroll_lock) ---p- ledscroll(group_lock) ---p- ledscroll(shift_lock) --dp- mousekeys(mousekeys) --dp- norepeat(norepeat) +-dp- accessx(basic) +--p- accessx(full) -d-- basic(basic) +-d-- complete(complete) +-d-- default(default) +-dp- iso9995(default) -dp- japan(japan) --p- japan(kana_lock) --d-- xtest(xtest) --dp- ledcaps(caps_lock) ---p- ledcaps(group_lock) ---p- ledcaps(shift_lock) --d-- complete(complete) h-p- keypad(overlay) h-p- keypad(overlay1) h-p- keypad(overlay2) --dp- lednum(num_lock) +-dp- ledcaps(caps_lock) +--p- ledcaps(group_lock) +--p- ledcaps(shift_lock) --p- lednum(group_lock) +-dp- lednum(num_lock) --p- lednum(shift_lock) +--p- ledscroll(group_lock) +-dp- ledscroll(scroll_lock) +--p- ledscroll(shift_lock) -dp- level5(default) --dp- accessx(basic) ---p- accessx(full) --dp- iso9995(default) +-dp- misc(misc) +-dp- mousekeys(mousekeys) +-dp- norepeat(norepeat) +-dp- pc(pc) +-d-- pc98(basic) -dp- xfree86(basic) +-d-- xtest(xtest) diff --git a/debian/changelog b/debian/changelog index 05797c7..6ef39da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xkeyboard-config (1.0~cvs.20070721-1) UNRELEASED; urgency=low +xkeyboard-config (1.0~cvs.20070721-1) unstable; urgency=low [ Julien Cristau ] * Fix watch file to look for tarballs at http://xlibs.fd.o/xkbdesc/ @@ -14,7 +14,7 @@ xkeyboard-config (1.0~cvs.20070721-1) UNRELEASED; urgency=low * Patches obsoleted: + greek.diff. - -- Mohammed Adnène Trojette [EMAIL PROTECTED] Sat, 21 Jul 2007 19:42:15 +0200 + -- Mohammed Adnène Trojette [EMAIL PROTECTED] Sat, 21 Jul 2007 20:51:07 +0200 xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low diff --git a/debian/patches/send-upstream/001_keypad_comma.diff b/debian/patches/send-upstream/001_keypad_comma.diff index a4c4926..a21bd18 100644 --- a/debian/patches/send-upstream/001_keypad_comma.diff +++ b/debian/patches/send-upstream/001_keypad_comma.diff @@ -1,19 +1,35 @@ Index: xkb-data/rules/base === xkb-data.orig/rules/base 2007-07-21 19:54:58.0 +0200 -+++ xkb-data/rules/base2007-07-21
xkb-data: Changes to 'debian-unstable'
compat/compat.dir | 36 - docs/README.config |2 geometry/geometry.dir | 126 ++-- keycodes/keycodes.dir | 129 ++--- keymap/keymap.dir | 448 + rules/base | 435 - rules/base.lst |3 rules/base.o_s.part|3 rules/base.xml.in | 18 rules/compat/Makefile.am |7 rules/compat/Makefile.in | 10 rules/compat/base.ml1_s.part | 134 ++--- rules/compat/base.ml1v1_s.part | 82 +-- rules/compat/base.ml_s.part| 134 ++--- rules/compat/base.mlv_s.part | 82 +-- symbols/group | 12 symbols/inet |1 symbols/level3 |2 symbols/symbols.dir| 1036 - types/types.dir| 14 20 files changed, 1348 insertions(+), 1366 deletions(-) New commits: commit 5c193b36586ce4cdd5b620ece74ea46ac4502779 Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sat Jul 21 21:05:57 2007 +0200 restore upstream's versions diff --git a/compat/compat.dir b/compat/compat.dir index 088c40d..c04d31e 100644 --- a/compat/compat.dir +++ b/compat/compat.dir @@ -1,28 +1,28 @@ --dp- accessx(basic) ---p- accessx(full) --d-- basic(basic) --d-- complete(complete) +-dp- pc(pc) +-dp- misc(misc) +-d-- pc98(basic) -d-- default(default) --dp- iso9995(default) +-dp- ledscroll(scroll_lock) +--p- ledscroll(group_lock) +--p- ledscroll(shift_lock) +-dp- mousekeys(mousekeys) +-dp- norepeat(norepeat) +-d-- basic(basic) -dp- japan(japan) --p- japan(kana_lock) -h-p- keypad(overlay) -h-p- keypad(overlay1) -h-p- keypad(overlay2) +-d-- xtest(xtest) -dp- ledcaps(caps_lock) --p- ledcaps(group_lock) --p- ledcaps(shift_lock) ---p- lednum(group_lock) +-d-- complete(complete) +h-p- keypad(overlay) +h-p- keypad(overlay1) +h-p- keypad(overlay2) -dp- lednum(num_lock) +--p- lednum(group_lock) --p- lednum(shift_lock) ---p- ledscroll(group_lock) --dp- ledscroll(scroll_lock) ---p- ledscroll(shift_lock) -dp- level5(default) --dp- misc(misc) --dp- mousekeys(mousekeys) --dp- norepeat(norepeat) --dp- pc(pc) --d-- pc98(basic) +-dp- accessx(basic) +--p- accessx(full) +-dp- iso9995(default) -dp- xfree86(basic) --d-- xtest(xtest) diff --git a/docs/README.config b/docs/README.config index d738be6..4a06886 100644 --- a/docs/README.config +++ b/docs/README.config @@ -41,7 +41,7 @@ The parameters are: The proper rules file depends on your vendor. In reality, the commonest file of rules is xfree86. For each rules file there is a description file named vendor-rules.lst, for instance xfree86.lst which is located in xkb configu- -ration subdirectory rules (for example /usr/share/X11/xkb/rules). +ration subdirectory rules (for example /etc/X11/xkb/rules). 2.1 Basic Configuration diff --git a/geometry/geometry.dir b/geometry/geometry.dir index c88d851..fae8590 100644 --- a/geometry/geometry.dir +++ b/geometry/geometry.dir @@ -1,90 +1,90 @@ - amiga(de) --d-- amiga(usa1) - ataritt(de) --d-- ataritt(us) --d-- chicony(us) --d-- dell(dell101) - digital_vndr/lk(lk201) - digital_vndr/lk(lk401) - digital_vndr/lk(lk401bj) - digital_vndr/lk(lk401jj) - digital_vndr/lk(lk450) ---p- digital_vndr/pc(common) ---p- digital_vndr/pc(leds_alone) ---p- digital_vndr/pc(leds_on_keys) - digital_vndr/pc(pc101) - digital_vndr/pc(pc102) - digital_vndr/pc(pcxaj) - digital_vndr/unix(lk421jj) - digital_vndr/unix(unix) --d-- everex(STEPnote) --d-- fujitsu(138) - fujitsu(140) +-d-- hp(pc101) hp(hil) hp(omnibook) hp(omnibook_intl) --d-- hp(pc101) --d-- keytronic(FlexPro) --d-- kinesis(model100) - macintosh(applepro) - macintosh(macbook78) - macintosh(macbook79) --d-- macintosh(macintosh) --d-- microsoft(natural) --d-- nec(pc98) --d--
Bug#432613: xkb-data: virtual keys missing from evdev keycodes, breaks modifiers
On Wed, Jul 11, 2007, Yann Vernier wrote: to codes that never occur. I added similar lines to evdev: // Fake keycodes for virtual keys MDSW = 241; LVL3 = 242; ALT = 243; META = 244; SUPR = 245; HYPR = 246; And now my bindings do work. In linux/input.h keycode 240 is called unknown and the range 241-255 are not defined. Please could you prepare a patch ready to be applied? It would be really kind from you. I'll forward it upstream and try to prepare an upload this week-end. -- Mohammed Adnène Trojette
Bug#167370: Please allow relicensing under X11/MIT terms
Hi Doug, would you please allow to redistribute the hhk files under the MIT/X11 license to allow its distribution inside the whole xkeyboard-config package? For more information, please see https://bugs.freedesktop.org/show_bug.cgi?id=11519 -- Mohammed Adnène Trojette
Bug#355822: xkb: some multimedia sends events forever once pressed
On Wed, May 02, 2007, Gilles Grandou wrote: The problem still exists using an update to date sid. Please could you test the experimental package? -- Mohammed Adnène Trojette
Bug#194840: xlibs: Swiss (de_CH) keyboard variant to enable capital Umlauts with nodeadkeys
On Sat, Mar 24, 2007, Adrian von Bidder wrote:
tags 194840 +patch
Hi Adrian,
isn't this part of the symbols/ch file already covering your patch?
partial alphanumeric_keys
xkb_symbols de_nodeadkeys {
// modify the basic Swiss German layout not to have any dead keys
include ch(basic)
name[Group1]= Switzerland - German, eliminate dead keys;
key AE11 { [ apostrophe, question,acute ] };
key AE12 { [ asciicircum,grave, asciitilde ] };
key AD12 { [ diaeresis, exclam, bracketright ] };
};
Thanks for your help,
--
Mohammed Adnène Trojette
Bug#421532: Missing line in US keyboard layout
On Sun, Apr 29, 2007, situert wrote: Note: The attached patch is a patch to the latest version of the US keyboard layout file from the CVS of freedesktop.org. Please see: http://webcvs.freedesktop.org/xkeyboard-config/xkeyboard-config/symbols/us?view=co for the latest version of the US keyboard layout. The latest version is packaged in experimental. I've added the patches applied upstream to it. It should be fixed in the next upload. http://bugs.freedesktop.org/show_bug.cgi?id=8789 https://bugs.freedesktop.org/show_bug.cgi?id=10811 Only the beginning of your patch is applied there. Was the rest intended to be integrated? Thanks for the report, -- Mohammed Adnène Trojette
xkb-data: Changes to 'debian-experimental'
debian/changelog | 11 +++
debian/patches/backports/001_fix_us_layout.diff| 18 +
debian/patches/send-upstream/001_keypad_comma.diff |2
debian/patches/send-upstream/002_add_asus6000.diff | 69 +
debian/patches/series |2
5 files changed, 100 insertions(+), 2 deletions(-)
New commits:
commit a89c54aa311859687e618b7ab2de1c45b1ea736c
Author: Mohammed Adnene Trojette [EMAIL PROTECTED]
Date: Mon Apr 30 00:20:08 2007 +0200
Fix US layout (001_fix_us_layout.diff)
+ Debian bug #421532
+ X.org bugs #8789 and #10811
Add keypad:comma (001_keypad_comma.diff)
+ Debian bug #409117 to forward
Add Asus 6000 series laptop layout
+ Debian bug #383953 to forward
diff --git a/debian/changelog b/debian/changelog
index 32b5e83..0617d7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xkeyboard-config (0.9+cvs.20070428-2) UNRELEASED; urgency=low
+
+ * Patches to send upstream.
+ + 002_add_asus6000.diff: add Asus A6000 series Keyboard
+ support. (Closes: #383953)
+ * Patches backported from upstream:
+ + 001_fix_us.diff: fix us layout. (Closes: #421532)
+
+ -- Mohammed Adnène Trojette [EMAIL PROTECTED] Mon, 30 Apr 2007 00:12:26
+0200
+
xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low
* Add myself to Uploaders. (Closes: #401777)
@@ -8,7 +18,6 @@ xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low
+ fix keymap on iBook G4 Japanese keyboard. (Closes: #374070)
+ fix K6C key in symbols/inet. (Closes: #409982)
+ update Finnish layout. (Closes: #405207)
- + add Logitech Media Elite keyboard support. (Closes: #384801)
+ add Logitech Cordless Desktop Optical support. (Closes: #391192)
+ fix a jp106 backslash/yen issue. (Closes: #280579)
* Patches refreshed:
diff --git a/debian/patches/backports/001_fix_us_layout.diff
b/debian/patches/backports/001_fix_us_layout.diff
new file mode 100644
index 000..debcb66
--- /dev/null
+++ b/debian/patches/backports/001_fix_us_layout.diff
@@ -0,0 +1,18 @@
+Index: xkb-data-experimental/symbols/us
+===
+--- xkb-data-experimental.orig/symbols/us
xkb-data-experimental/symbols/us
+@@ -61,6 +61,8 @@
+ key AB09 { [period,greater ] };
+ key AB10 { [ slash,question] };
+
++key BKSL { [ backslash, bar] };
++key CAPS { [ Caps_Lock ] };
+ // End alphanumeric section
+ };
+
+@@ -507,4 +509,3 @@
+ include us
+ name[Group1]= U.S. English - Macintosh;
+ };
+-
diff --git a/debian/patches/send-upstream/001_keypad_comma.diff
b/debian/patches/send-upstream/001_keypad_comma.diff
index 90b610f..9393376 100644
--- a/debian/patches/send-upstream/001_keypad_comma.diff
+++ b/debian/patches/send-upstream/001_keypad_comma.diff
@@ -2,7 +2,7 @@ Index: xkb-data-experimental/rules/base
===
--- xkb-data-experimental.orig/rules/base
+++ xkb-data-experimental/rules/base
-@@ -828,6 +828,7 @@
+@@ -826,6 +826,7 @@
eurosign:2 = +eurosign(2)
keypad:oss= +keypad(oss)
keypad:legacy = +keypad(legacy)
diff --git a/debian/patches/send-upstream/002_add_asus6000.diff
b/debian/patches/send-upstream/002_add_asus6000.diff
new file mode 100644
index 000..a7bfd04
--- /dev/null
+++ b/debian/patches/send-upstream/002_add_asus6000.diff
@@ -0,0 +1,69 @@
+Index: xkb-data-experimental/rules/base
+===
+--- xkb-data-experimental.orig/rules/base
xkb-data-experimental/rules/base
+@@ -34,7 +34,7 @@
+
+ ! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
+ acer_c300 acer_ferrari4k acer_tm_800 \
+- acpi airkey armada azonaRF2300 \
++ acpi airkey armada azonaRF2300 asus_6000 \
+ apple \
+ benqx730 benqx800 brother \
+ btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 btc9019u \
+Index: xkb-data-experimental/rules/base.xml.in
+===
+--- xkb-data-experimental.orig/rules/base.xml.in
xkb-data-experimental/rules/base.xml.in
+@@ -119,6 +119,12 @@
+ model
+ configItem
+ nameazonaRF2300/name
++_descriptionAsus A6000 series Keyboard/_description
++ /configItem
++/model
++model
++ configItem
++nameasus_6000/name
+ _descriptionAzona RF2300 wireless Internet Keyboard/_description
+ /configItem
+ /model
+Index: xkb-data-experimental/symbols/inet
+===
+--- xkb-data-experimental.orig/symbols/inet
Bug#421532: Missing line in US keyboard layout
On Sun, Apr 29, 2007, situert wrote: Does this mean that this bug won't be fixed in stable (Etch)? No, it won't: Etch has been released and this fix is not critical, that's to say not important enough to justify an update for the stable version. No, I included all of the changes between the layout file shipped with Debian and the latest one in the CVS True. It's included then and will be available in the next upload. Regards, -- Mohammed Adnène Trojette
xkb-data: Changes to 'debian-experimental'
ChangeLog | 12 INSTALL | 236 - debian/changelog | 26 debian/compat |2 debian/control |4 debian/patches/01_cymotion_master_and_ibm_space_saver.diff | 76 debian/patches/02_xkb_symbols_euro_support.diff | 72 debian/patches/03_drop_rules_xorg_duplicates.diff | 64 debian/patches/04_czech_include_location.diff | 31 debian/patches/05_evdev_xkb.diff | 763 --- debian/patches/06_AB10_minus_underscore.diff | 42 debian/patches/07_AE12_apostrophe_on_pc_de_nodeadkeys.diff | 22 debian/patches/08_implement_grp:sclk_toggle.diff | 75 debian/patches/09_enable_ca_variants.diff | 16 debian/patches/10_ralt_switch_multikey.diff | 63 debian/patches/11_uk_macintosh_problems.diff | 50 debian/patches/12_implement_compose:caps.diff | 65 debian/patches/13_macintosh_problems.diff | 22 debian/patches/14_dead_diaresis.diff | 21 debian/patches/15_symbols_polish_keypad_separator.diff | 55 debian/patches/16_brazilian_keypad_separator.diff | 32 debian/patches/17_tr_fix_eacute.diff | 15 debian/patches/18_riscpc_keycodes.diff | 155 debian/patches/19_sun_loads_srvr_ctrl.diff | 65 debian/patches/bz1576.diff | 202 - debian/patches/bz8668.diff | 53 debian/patches/compat-misc.diff | 18 debian/patches/compatibility.diff | 132 debian/patches/cvs.diff |1 debian/patches/fix_xkbcomp_crash.diff | 204 - debian/patches/japan.diff | 143 debian/patches/obsolete_merged-upstream/01_cymotion_master_and_ibm_space_saver.diff | 76 debian/patches/obsolete_merged-upstream/02_xkb_symbols_euro_support.diff | 72 debian/patches/obsolete_merged-upstream/03_drop_rules_xorg_duplicates.diff | 64 debian/patches/obsolete_merged-upstream/04_czech_include_location.diff | 31 debian/patches/obsolete_merged-upstream/05_evdev_xkb.diff | 763 +++ debian/patches/obsolete_merged-upstream/06_AB10_minus_underscore.diff | 42 debian/patches/obsolete_merged-upstream/07_AE12_apostrophe_on_pc_de_nodeadkeys.diff | 22 debian/patches/obsolete_merged-upstream/08_implement_grp:sclk_toggle.diff | 75 debian/patches/obsolete_merged-upstream/09_enable_ca_variants.diff | 16 debian/patches/obsolete_merged-upstream/10_ralt_switch_multikey.diff | 63 debian/patches/obsolete_merged-upstream/11_uk_macintosh_problems.diff | 50 debian/patches/obsolete_merged-upstream/12_implement_compose:caps.diff | 65 debian/patches/obsolete_merged-upstream/13_macintosh_problems.diff | 22 debian/patches/obsolete_merged-upstream/14_dead_diaresis.diff | 21 debian/patches/obsolete_merged-upstream/15_symbols_polish_keypad_separator.diff | 55 debian/patches/obsolete_merged-upstream/16_brazilian_keypad_separator.diff | 32 debian/patches/obsolete_merged-upstream/17_tr_fix_eacute.diff | 15 debian/patches/obsolete_merged-upstream/18_riscpc_keycodes.diff | 155 debian/patches/obsolete_merged-upstream/19_sun_loads_srvr_ctrl.diff | 65 debian/patches/obsolete_merged-upstream/bz1576.diff | 202 + debian/patches/obsolete_merged-upstream/bz8668.diff | 53 debian/patches/obsolete_merged-upstream/compat-misc.diff | 18
Bug#400515: /usr/share/X11/xkb/symbols/us: backslash not working in us layout if layout set to cz, us
On Sun, Nov 26, 2006, Marek Schmidt wrote: The BKSL key (backslash/pipe key) is not working properly if I set xxkbmap to For people who want their ralt back, there is an option lv3:ralt_alt. Does it fix the issue for you? -- Mohammed Adnène Trojette
Bug#261088: Suggestion: xkb rules for Thinkpad extra keys
On Fri, Jul 23, 2004, Hile Tuohela wrote: The files are available with a html README from http://hile.dyndns.org/xkb-thinkpad.tgz This page does no more exist. Please next time attach the file. I am closing the bug, since there is no more input. Feel free to reopen the bug if you reproduce it. -- Mohammed Adnène Trojette
Bug#281398: kde-core: AltGr no longer works
On Mon, Nov 15, 2004, Gabor Nagy wrote: Recently I have noticed that AltGr does not work anymore in the Hungarian layout. For people who want their ralt back, there is an option lv3:ralt_alt. Does it fix the issue for you? -- Mohammed Adnène Trojette
xkb-data: Changes to 'debian-experimental'
New branch 'debian-experimental' available with the following commits: commit 2aced805e4d331e116c46c552010e4e535098f94 Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Tue Apr 24 12:25:27 2007 +0200 New CVS Snapshot April 24 2007. + new layouts + new rules + update translations commit d908fbaffb8be8553c82e33a82d38c38f101a224 Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Tue Apr 24 12:23:42 2007 +0200 New CVS Snapshot April 24 2007 Let us upload a CVS Snapshot to experimental: + debian/patches/series: comment out obsolete patches + debian/patches/*.diff: refresh others -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xkb-data: Changes to 'debian-unstable'
debian/changelog |5 - 1 files changed, 4 insertions(+), 1 deletion(-) New commits: commit 52f49a0d02dc58c5ccdd1569dbce04ec58a3e594 Author: Mohammed Adnene Trojette [EMAIL PROTECTED] Date: Sun Apr 22 15:56:37 2007 +0200 * Backport fixes: + uz.diff: fix Uzbek layout. (Closes: #412528) + compat-misc.diff: fix typo. (Closes: #412352) Backports from upstream's CVS. diff --git a/debian/changelog b/debian/changelog index 2ede895..7b38b3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ xkeyboard-config (0.9-5) unstable; urgency=low * Add myself to Uploaders. (Closes: #401777) + * Backport fixes: + + uz.diff: fix Uzbek layout. (Closes: #412528) + + compat-misc.diff: fix typo. (Closes: #412352) - -- Mohammed Adnène Trojette [EMAIL PROTECTED] Sat, 21 Apr 2007 22:50:42 +0200 + -- Mohammed Adnène Trojette [EMAIL PROTECTED] Sat, 21 Apr 2007 23:47:20 +0200 xkeyboard-config (0.9-4) unstable; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xkb-data: Changes to 'debian-unstable'
ABOUT-NLS | 768 + AUTHORS|6 COPYING| 17 CREDITS|3 INSTALL| 236 ++ Makefile.am| 28 README | 25 TODO |6 autogen.sh | 14 compat/Makefile.am | 13 compat/README | 33 compat/accessx | 54 compat/basic | 52 compat/complete| 12 compat/default | 13 compat/iso9995 | 84 + compat/japan | 48 compat/keypad | 60 compat/ledcaps | 23 compat/lednum | 23 compat/ledscroll | 23 compat/misc| 117 + compat/mousekeys | 205 ++ compat/norepeat| 11 compat/pc | 18 compat/pc98| 62 compat/xfree86 | 57 compat/xtest | 58 config.guess | 1465 + config.sub | 1569 ++ debian/changelog |6 debian/control |1 debian/patches/compat-misc.diff| 18 debian/patches/uz.diff | 86 + docs/HOWTO.testing | 22 docs/HOWTO.transition | 19 docs/Makefile.am |1 docs/README.symbols| 51 geometry/README|6 geometry/amiga | 270 +++ geometry/ataritt | 257 +++ geometry/chicony | 190 ++ geometry/dell | 183 ++ geometry/digital_vndr/Makefile.am |4 geometry/digital_vndr/lk | 730 geometry/digital_vndr/pc | 350 geometry/digital_vndr/unix | 230 ++ geometry/everex| 172 ++ geometry/fujitsu | 315 +++ geometry/hp| 456 + geometry/keytronic | 253 +++ geometry/kinesis | 191 ++ geometry/microsoft | 254 +++ geometry/nec | 159 + geometry/northgate | 170 ++ geometry/sgi_vndr/Makefile.am |4 geometry/sgi_vndr/O2 | 616 +++ geometry/sgi_vndr/indigo | 411 geometry/sgi_vndr/indy | 599 +++ geometry/sony | 180 ++ geometry/sun | 3056 + geometry/winbook | 144 + install-sh | 323 +++ intltool-extract.in| 516 ++ intltool-merge.in | 1315 +++ intltool-update.in | 1063 keycodes/Makefile.am | 21 keycodes/README|6 keycodes/aliases | 99 + keycodes/amiga | 231 ++ keycodes/ataritt | 123 + keycodes/digital_vndr/Makefile.am |4 keycodes/digital_vndr/lk | 271 +++ keycodes/digital_vndr/pc | 280 +++ keycodes/fujitsu | 187 ++ keycodes/hp| 271 +++ keycodes/ibm | 151 + keycodes/powerpcps2| 134 + keycodes/sgi_vndr/Makefile.am |4 keycodes/sgi_vndr/indigo | 140 + keycodes/sgi_vndr/indy | 203 ++ keycodes/sgi_vndr/iris | 11 keycodes/sony | 142 + keycodes/sun | 931 +++ keycodes/xfree98 | 155 + keymap/Makefile.am | 10 keymap/README |4 keymap/amiga | 22 keymap/ataritt | 21 keymap/digital_vndr/Makefile.am|4 keymap/digital_vndr/us | 188 ++ keymap/sgi_vndr/Makefile.am| 12 keymap/sgi_vndr/be | 34 keymap/sgi_vndr/ca | 33 keymap/sgi_vndr/ch | 67 keymap/sgi_vndr/cz | 33 keymap/sgi_vndr/de | 34 keymap/sgi_vndr/dk | 34 keymap/sgi_vndr/dvorak | 15 keymap/sgi_vndr/es | 34 keymap/sgi_vndr/fi | 34 keymap/sgi_vndr/fr | 34 keymap/sgi_vndr/gb | 34 keymap/sgi_vndr/it | 34 keymap/sgi_vndr/jp |8 keymap/sgi_vndr/no | 34 keymap/sgi_vndr/pl | 29 keymap/sgi_vndr/pt | 34 keymap/sgi_vndr/se
