X Strike Force XFree86 SVN commit: r1935 - in trunk/debian: . patches
Author: barbier
Date: 2004-10-09 05:12:59 -0500 (Sat, 09 Oct 2004)
New Revision: 1935
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/099j_xkb_new_layouts.diff
Log:
Add keypad(comma) symbol needed by the Hungarian layout.
Fix comment about the Japanese layout.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-09 02:51:27 UTC (rev 1934)
+++ trunk/debian/CHANGESETS 2004-10-09 10:12:59 UTC (rev 1935)
@@ -84,13 +84,12 @@
<RCTL> instead of <RALT>. (Closes: #274457)
+ jp (Japan) also requires a combination of two variants. When this is
the only loaded layout, the full combination is used. When this layout
- is combined with others, both the "jp106" and "latin" variants must be
- explicitly specified.
+ is combined with others, only the "jp106" variant is loaded.
+ hu (Hungary) layout has been simplified; some variants have been removed.
(Closes: #263561)
+ ch (Switzerland) replaces de_CH and fr_CH.
+ mn (Mongolia) and vn (Vietnam) are simple layouts.
- 1930
+ 1930, 1935
Remove build-dependency on libstdc++5-dev | libstdc++-dev. A package
providing libstdc++-dev is build-essential. Thanks for Steve Langasek for
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-09 02:51:27 UTC (rev 1934)
+++ trunk/debian/changelog 2004-10-09 10:12:59 UTC (rev 1935)
@@ -53,8 +53,7 @@
<RCTL> instead of <RALT>. (Closes: #274457)
+ jp (Japan) also requires a combination of two variants. When this is
the only loaded layout, the full combination is used. When this layout
- is combined with others, both the "jp106" and "latin" variants must be
- explicitly specified.
+ is combined with others, only the "jp106" variant is loaded.
+ hu (Hungary) layout has been simplified; some variants have been removed.
(Closes: #263561)
+ ch (Switzerland) replaces de_CH and fr_CH.
Modified: trunk/debian/patches/099j_xkb_new_layouts.diff
===================================================================
--- trunk/debian/patches/099j_xkb_new_layouts.diff 2004-10-09 02:51:27 UTC (rev 1934)
+++ trunk/debian/patches/099j_xkb_new_layouts.diff 2004-10-09 10:12:59 UTC (rev 1935)
@@ -10,6 +10,9 @@
symbols/group:
+ Add "rctrl_switch" needed by the ca layout.
+symbols/keypad:
+ + Add "comma" needed by the hu layout.
+
symbols/pc/Imakefile:
+ Add ca, ch, hu, jp, mn and vn.
@@ -78,6 +81,20 @@
// using the group(toggle) map, pressing the right alt key switches to
// the next sequential group (until the next explicit group change).
partial modifier_keys
+diff -ruN xc-old/programs/xkbcomp/symbols/keypad xc/programs/xkbcomp/symbols/keypad
+--- xc-old/programs/xkbcomp/symbols/keypad 2001-01-17 23:45:59.000000000 +0000
++++ xc/programs/xkbcomp/symbols/keypad 2004-10-09 09:42:34.000000000 +0000
+@@ -79,3 +79,10 @@
+
+ // End "Keypad" section
+ };
++
++// Some national standards use comma on the keypad instead of decimal dot
++partial keypad_keys
++xkb_symbols "comma" {
++ key <KPDL> { [ KP_Delete, KP_Separator ] };
++};
++
diff -ruN xc-old/programs/xkbcomp/symbols/pc/Imakefile xc/programs/xkbcomp/symbols/pc/Imakefile
--- xc-old/programs/xkbcomp/symbols/pc/Imakefile 2004-10-08 22:36:37.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/Imakefile 2004-10-08 22:38:10.000000000 +0000
Reply to: