Author: barbier Date: 2004-09-18 02:39:44 -0500 (Sat, 18 Sep 2004) New Revision: 1825
Modified: trunk/debian/CHANGESETS trunk/debian/changelog trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff Log: * Declare hu_US layout as being in old format (thanks, Veres Lajos) (Closes: #247463) * Really list all old format layouts in rules/xfree86 ($oldlayouts), do not grep only those listed in xfree86.lst Modified: trunk/debian/CHANGESETS =================================================================== --- trunk/debian/CHANGESETS 2004-09-17 23:23:50 UTC (rev 1824) +++ trunk/debian/CHANGESETS 2004-09-18 07:39:44 UTC (rev 1825) @@ -34,14 +34,14 @@ Fix inconsistencies in rules/xfree86* files: + rules/xfree86: List in $oldlayouts all layouts which are currently not available in xlibs Debian package under the new multilayout format. - (Closes: #270810) ++ rules/xfree86: Declare hu_US layout as being in old format (thanks, + Veres Lajos) + rules/xfree86: The lv3:ralt_switch option, which does exist in xfree86.lst, was forgotten in this file. + rules/xfree86.{lst,xml}: Options altwin:meta_super and altwin:meta_hyper are replaced by their right names altwin:super_win and altwin:hyper_win. - (Closes: #271259) + rules/xfree86.{lst,xml}: Perform changes to synchronize these files. - 1822 + 1822, 1825 Add FAQ entry: My keyboard configuration worked with XFree86 4.2, why is it messed up now? Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-09-17 23:23:50 UTC (rev 1824) +++ trunk/debian/changelog 2004-09-18 07:39:44 UTC (rev 1825) @@ -28,6 +28,9 @@ why is it messed up now? (Closes: #259740) + * Declare hu_US layout as being in old format (thanks, Veres Lajos) + (Closes: #247463) + Changes by Branden Robinson: * In the Xsession script, attempt to create a file of non-zero length in Modified: trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff =================================================================== --- trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-09-17 23:23:50 UTC (rev 1824) +++ trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-09-18 07:39:44 UTC (rev 1825) @@ -5,20 +5,22 @@ Fix inconsistencies in rules/xfree86* files. rules/xfree86: - List in $oldlayouts all layouts which are currently not available + + List in $oldlayouts all layouts which are currently not available in xlibs Debian package under the new multilayout format. (Closes: #271259) - The lv3:ralt_switch option, which does exist in xfree86.lst, was + + The lv3:ralt_switch option, which does exist in xfree86.lst, was forgotten in this file. + + Add support for hu_US layout in old format (thanks, Veres Lajos) + (Closes: #247463) rules/xfree86.lst rules/xfree86.xml: - Options altwin:meta_super and altwin:meta_hyper are replaced by + + Options altwin:meta_super and altwin:meta_hyper are replaced by their right names altwin:super_win and altwin:hyper_win in rules/xfree86.lst and rules/xfree86.xml (Closes: #271259) rules/xfree86.lst rules/xfree86.xml: - Perform changes to synchronize these files. + + Perform changes to synchronize these files. diff -ruN xc-old/programs/xkbcomp/rules/xfree86 xc/programs/xkbcomp/rules/xfree86 --- xc-old/programs/xkbcomp/rules/xfree86 Thu Sep 16 17:03:12 2004 @@ -28,7 +30,7 @@ // Layouts that still need be composed by old rules -! $oldlayouts = az bs ca ca_enhanced de_CH fr_CH hu hu_qwerty lt_std mn vn hr_US -+! $oldlayouts = az bs ca ca_enhanced de_CH fr_CH hr_US hu hu_qwerty jp lt_std mn ru_yawerty se_FI se_NO se_SE tr_f vn ++! $oldlayouts = az bs ca ca_enhanced czsk de_CH fr_CH hr_US hu hu_US hu_qwerty jp lt_a lt_p lt_std mn ro2 ru_yawerty se_FI se_NO se_SE tr_f vn // If you want non-latin layouts implicitly include the en_US layout // uncomment lines below @@ -41,9 +43,14 @@ ctrl:swapcaps = +ctrl(swapcaps) ctrl:ctrl_ac = +ctrl(ctrl_ac) diff -ruN xc-old/programs/xkbcomp/rules/xfree86.lst xc/programs/xkbcomp/rules/xfree86.lst ---- xc-old/programs/xkbcomp/rules/xfree86.lst Thu Sep 16 17:03:12 2004 -+++ xc/programs/xkbcomp/rules/xfree86.lst Thu Sep 16 17:04:46 2004 -@@ -144,7 +144,9 @@ +--- xc-old/programs/xkbcomp/rules/xfree86.lst 2004-09-18 07:18:23.000000000 +0000 ++++ xc/programs/xkbcomp/rules/xfree86.lst 2004-09-18 07:26:12.000000000 +0000 +@@ -140,11 +140,14 @@ + gur Gurmukhi + dev Hindi + hu Hungarian ++ hu_US Hungarian (US) + hu_qwerty Hungarian (qwerty) is Icelandic iu Inuktitut ir Iranian @@ -53,7 +60,7 @@ it Italian jp Japanese kan Kannada -@@ -198,7 +200,8 @@ +@@ -198,7 +201,8 @@ ! option grp Group Shift/Lock behavior @@ -63,7 +70,7 @@ grp:lwin_switch Left Win-key switches group while pressed grp:rwin_switch Right Win-key switches group while pressed grp:win_switch Both Win-keys switch group while pressed -@@ -225,6 +228,7 @@ +@@ -225,6 +229,7 @@ lv3:win_switch Press any of Win-keys to choose 3rd level lv3:lwin_switch Press Left Win-key to choose 3rd level lv3:rwin_switch Press Right Win-key to choose 3rd level @@ -71,7 +78,7 @@ ctrl Control Key Position ctrl:nocaps Make CapsLock an additional Control ctrl:swapcaps Swap Control and Caps Lock -@@ -245,8 +249,8 @@ +@@ -245,8 +250,8 @@ altwin:meta_alt Alt and Meta on the Alt keys (default). altwin:meta_win Meta is mapped to the Win-keys. altwin:left_meta_win Meta is mapped to the left Win-key. @@ -83,8 +90,8 @@ compose:ralt Right Alt is Compose compose:rwin Right Win-key is Compose diff -ruN xc-old/programs/xkbcomp/rules/xfree86.xml xc/programs/xkbcomp/rules/xfree86.xml ---- xc-old/programs/xkbcomp/rules/xfree86.xml Thu Sep 16 17:03:12 2004 -+++ xc/programs/xkbcomp/rules/xfree86.xml Thu Sep 16 17:04:46 2004 +--- xc-old/programs/xkbcomp/rules/xfree86.xml 2004-09-18 07:18:23.000000000 +0000 ++++ xc/programs/xkbcomp/rules/xfree86.xml 2004-09-18 07:26:45.000000000 +0000 @@ -276,8 +276,14 @@ </model> <model> @@ -156,10 +163,24 @@ <name>fi</name> <description>Finnish</description> <description xml:lang="bg">финландска</description> -@@ -1431,6 +1448,50 @@ +@@ -1389,6 +1406,13 @@ </layout> <layout> <configItem> ++ <name>hu_US</name> ++ <description>Hungarian (US)</description> ++ </configItem> ++ <variantList/> ++ </layout> ++ <layout> ++ <configItem> + <name>hu_qwerty</name> + <description>Hungarian (qwerty)</description> + <description xml:lang="ru">Венгерская (qwerty)</description> +@@ -1431,6 +1455,50 @@ + </layout> + <layout> + <configItem> + <name>ir</name> + <description>Iranian</description> + <description xml:lang="ru">Фарси</description> @@ -207,7 +228,7 @@ <name>il</name> <description>Israeli</description> <description xml:lang="bg">израелска</description> -@@ -1455,6 +1516,13 @@ +@@ -1455,6 +1523,13 @@ </layout> <layout> <configItem> @@ -221,7 +242,7 @@ <name>it</name> <description>Italian</description> <description xml:lang="bg">италианска</description> -@@ -2085,16 +2153,17 @@ +@@ -2085,16 +2160,17 @@ <description xml:lang="bg">турска</description> <description xml:lang="ru">Турецкая</description> </configItem> @@ -249,7 +270,7 @@ </layout> <layout> <configItem> -@@ -2168,52 +2237,6 @@ +@@ -2168,52 +2244,6 @@ </layout> <layout> <configItem> @@ -302,7 +323,7 @@ <name>sapmi</name> <description>sapmi - No decription</description> <description xml:lang="bg">sapmi - без описание</description> -@@ -2257,8 +2280,14 @@ +@@ -2257,8 +2287,14 @@ </configItem> <option> <configItem> @@ -318,7 +339,7 @@ <description xml:lang="bg">Десният Alt сменя групата докато е натиснат</description> <description xml:lang="ru">Правая клавиша Alt переключает группу на время нажатия</description> </configItem> -@@ -2464,6 +2493,12 @@ +@@ -2464,6 +2500,12 @@ <description xml:lang="ru">Выбор 3-го уровня нажатием правой клавиши Win</description> </configItem> </option> @@ -331,7 +352,7 @@ </group> <group allowMultipleSelection="false"> <configItem> -@@ -2617,7 +2652,7 @@ +@@ -2617,7 +2659,7 @@ </option> <option> <configItem> @@ -340,7 +361,7 @@ <description>Super is mapped to the Win-keys (default).</description> <description xml:lang="bg">Win клавишите функционират като Super</description> <description xml:lang="ru">Super соответствует клавишам Win (по умолчанию)</description> -@@ -2625,7 +2660,7 @@ +@@ -2625,7 +2667,7 @@ </option> <option> <configItem> Property changes on: trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff ___________________________________________________________________ Name: svn:keywords + Id