Author: barbier Date: 2004-09-27 16:54:08 -0500 (Mon, 27 Sep 2004) New Revision: 1876
Modified: trunk/debian/CHANGESETS trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff Log: tr_f is both an old style layout and a variant of a 'tr' new style layout. The latter is preferred over the former, so revert the bogus change in rules/xfree86.xml. Modified: trunk/debian/CHANGESETS =================================================================== --- trunk/debian/CHANGESETS 2004-09-27 21:52:00 UTC (rev 1875) +++ trunk/debian/CHANGESETS 2004-09-27 21:54:08 UTC (rev 1876) @@ -47,7 +47,7 @@ altwin:meta_hyper with the correct names altwin:super_win and altwin:hyper_win. (Closes: #271259) + rules/xfree86.{lst,xml}: Synchronize these files. - 1822, 1825, 1826 + 1822, 1825, 1826, 1876 Add FAQ entry: My keyboard configuration worked with XFree86 4.2; why is it messed up now? (Closes: #259740) Modified: trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff =================================================================== --- trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-09-27 21:52:00 UTC (rev 1875) +++ trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-09-27 21:54:08 UTC (rev 1876) @@ -246,34 +246,6 @@ <name>it</name> <description>Italian</description> <description xml:lang="bg">италианска</description> -@@ -2085,16 +2160,17 @@ - <description xml:lang="bg">турска</description> - <description xml:lang="ru">Турецкая</description> - </configItem> -- <variantList> -- <variant> -- <configItem> -- <name>tr_f</name> -- <description>Turkish (F)</description> -- <description xml:lang="bg">турска (F)</description> -- <description xml:lang="ru">Турецкая (F)</description> -- </configItem> -- </variant> -- </variantList> -+ <variantList/> -+ </layout> -+ <layout> -+ <configItem> -+ <name>tr_f</name> -+ <name>tr_f</name> -+ <description>Turkish (F)</description> -+ <description xml:lang="bg">турска (F)</description> -+ <description xml:lang="ru">Турецкая (F)</description> -+ </configItem> -+ <variantList/> - </layout> - <layout> - <configItem> @@ -2168,52 +2244,6 @@ </layout> <layout>