Author: barbier Date: 2004-10-09 15:42:34 -0500 (Sat, 09 Oct 2004) New Revision: 1936
Modified: trunk/debian/CHANGESETS trunk/debian/patches/099j_xkb_new_layouts.diff Log: In new ca and vn layouts, replace Unicode codepoints by keysyms when they are defined. Modified: trunk/debian/CHANGESETS =================================================================== --- trunk/debian/CHANGESETS 2004-10-09 10:12:59 UTC (rev 1935) +++ trunk/debian/CHANGESETS 2004-10-09 20:42:34 UTC (rev 1936) @@ -89,7 +89,7 @@ (Closes: #263561) + ch (Switzerland) replaces de_CH and fr_CH. + mn (Mongolia) and vn (Vietnam) are simple layouts. - 1930, 1935 + 1930, 1935, 1936 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/patches/099j_xkb_new_layouts.diff =================================================================== --- trunk/debian/patches/099j_xkb_new_layouts.diff 2004-10-09 10:12:59 UTC (rev 1935) +++ trunk/debian/patches/099j_xkb_new_layouts.diff 2004-10-09 20:42:34 UTC (rev 1936) @@ -129,7 +129,7 @@ all:: diff -ruN xc-old/programs/xkbcomp/symbols/pc/ca xc/programs/xkbcomp/symbols/pc/ca --- xc-old/programs/xkbcomp/symbols/pc/ca 1970-01-01 00:00:00.000000000 +0000 -+++ xc/programs/xkbcomp/symbols/pc/ca 2004-10-08 22:57:21.000000000 +0000 ++++ xc/programs/xkbcomp/symbols/pc/ca 2004-10-09 20:28:05.000000000 +0000 @@ -0,0 +1,204 @@ + +default partial @@ -300,10 +300,10 @@ + key <AD02> { [ lstroke, Lstroke ] }; + key <AD03> { [ oe, OE ] }; + key <AD04> { [ paragraph, registered ] }; -+ key <AD05> { [ U0167, U0166 ] }; -+ key <AD06> { [ U2190, yen ] }; -+ key <AD07> { [ U2193, U2191 ] }; -+ key <AD08> { [ U2192, idotless ] }; ++ key <AD05> { [ tslash, Tslash ] }; ++ key <AD06> { [ leftarrow, yen ] }; ++ key <AD07> { [ downarrow, uparrow ] }; ++ key <AD08> { [ rightarrow, idotless ] }; + key <AD09> { [ oslash, Ooblique ] }; + key <AD10> { [ thorn, THORN ] }; + key <AD11> { [ VoidSymbol, dead_abovering ] }; @@ -330,7 +330,7 @@ + key <AB05> { [ rightdoublequotemark, rightsinglequotemark ] }; + key <AB06> { [ U0149, U266A ] }; + key <AB07> { [ mu, masculine ] }; -+ key <AB08> { [ U2015, multiply ] }; ++ key <AB08> { [ Greek_horizbar, multiply ] }; + key <AB09> { [ periodcentered, division ] }; + key <AB10> { [ VoidSymbol, dead_abovedot ] }; + @@ -1263,8 +1263,8 @@ + key <AE11> { [ minus, underscore ] }; + key <AE12> { [ equal, plus, DongSign ] }; + -+ key <AD11> { [ bracketleft, braceleft, U01b0, U01af ] }; // U horn -+ key <AD12> { [ bracketright, braceright, U01a1, U01a0 ] }; // O horn ++ key <AD11> { [ bracketleft, braceleft, uhorn, Uhorn ] }; ++ key <AD12> { [ bracketright, braceright, ohorn, Ohorn ] }; + + // End alphanumeric section +