Author: barbier
Date: 2004-09-17 17:48:46 -0500 (Fri, 17 Sep 2004)
New Revision: 1822
Added:
trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
Log:
* 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: 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.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-09-17 22:28:44 UTC (rev 1821)
+++ trunk/debian/CHANGESETS 2004-09-17 22:48:46 UTC (rev 1822)
@@ -31,4 +31,16 @@
may believe that mod1 and mod4 are bound to Meta keys.
1821
+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: 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
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-09-17 22:28:44 UTC (rev 1821)
+++ trunk/debian/changelog 2004-09-17 22:48:46 UTC (rev 1822)
@@ -13,6 +13,17 @@
or altwin:left_meta_win are used. Otherwise XKB-unaware applications
may believe that mod1 and mod4 are bound to Meta keys.
+ * 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: 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.
+
Changes by Branden Robinson:
* In the Xsession script, attempt to create a file of non-zero length in
Added: trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
===================================================================
--- trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-09-17
22:28:44 UTC (rev 1821)
+++ trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-09-17
22:48:46 UTC (rev 1822)
@@ -0,0 +1,351 @@
+$Id$
+
+This patch by Denis Barbier.
+
+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: #271259)
+ The lv3:ralt_switch option, which does exist in xfree86.lst, was
+ forgotten in this file.
+
+rules/xfree86.lst rules/xfree86.xml:
+ 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.
+
+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
++++ xc/programs/xkbcomp/rules/xfree86 Fri Sep 17 14:26:43 2004
+@@ -9,7 +9,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
+
+ // If you want non-latin layouts implicitly include the en_US layout
+ // uncomment lines below
+@@ -157,6 +157,7 @@
+ lv3:win_switch = +level3(win_switch)
+ lv3:lwin_switch = +level3(lwin_switch)
+ lv3:rwin_switch = +level3(rwin_switch)
++ lv3:ralt_switch = +level3(ralt_switch)
+ ctrl:nocaps = +ctrl(nocaps)
+ 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 @@
+ is Icelandic
+ iu Inuktitut
+ ir Iranian
++ ie Irish
+ il Israeli
++ il_phonetic Israeli (phonetic)
+ it Italian
+ jp Japanese
+ kan Kannada
+@@ -198,7 +200,8 @@
+
+ ! option
+ grp Group Shift/Lock behavior
+- grp:switch R-Alt switches group while pressed
++ grp:lswitch Left Alt key switches group while pressed
++ grp:switch Right Alt key switches group while pressed
+ 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 @@
+ 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
++ lv3:ralt_switch Press Right Alt-key to choose 3rd level
+ ctrl Control Key Position
+ ctrl:nocaps Make CapsLock an additional Control
+ ctrl:swapcaps Swap Control and Caps Lock
+@@ -245,8 +249,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.
+- altwin:meta_super Super is mapped to the Win-keys (default).
+- altwin:meta_hyper Hyper is mapped to the Win-keys.
++ altwin:super_win Super is mapped to the Win-keys (default).
++ altwin:hyper_win Hyper is mapped to the Win-keys.
+
+ 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
+@@ -276,8 +276,14 @@
+ </model>
+ <model>
+ <configItem>
++ <name>hp5181</name>
++ <description>Hewlett-Packard 5181 Internet Keyboard</description>
++ </configItem>
++ </model>
++ <model>
++ <configItem>
+ <name>hpxe3gc</name>
+- <description>Hewlett-Packard Omnibook XE3 GC</description>
++ <description>Hewlett-Packard Omnibook XE3 GC, GD, GE and Pavilion
N5xxx</description>
+ </configItem>
+ </model>
+ <model>
+@@ -288,6 +294,12 @@
+ </model>
+ <model>
+ <configItem>
++ <name>hpxe4xxx</name>
++ <description>Hewlett-Packard Omnibook XE4xxx and ZE4xxx</description>
++ </configItem>
++ </model>
++ <model>
++ <configItem>
+ <name>hpxt1000</name>
+ <description>Hewlett-Packard Omnibook XT1000</description>
+ </configItem>
+@@ -306,6 +318,12 @@
+ </model>
+ <model>
+ <configItem>
++ <name>hp5xx</name>
++ <description>Hewlett-Packard Omnibook 5xx</description>
++ </configItem>
++ </model>
++ <model>
++ <configItem>
+ <name>honeywell_euroboard</name>
+ <description>Honeywell Euroboard</description>
+ </configItem>
+@@ -905,6 +923,13 @@
+ </layout>
+ <layout>
+ <configItem>
++ <name>hr_US</name>
++ <description>Croatian (US)</description>
++ </configItem>
++ <variantList/>
++ </layout>
++ <layout>
++ <configItem>
+ <name>cz</name>
+ <description>Czech</description>
+ <description xml:lang="bg">чехшка</description>
+@@ -1033,14 +1058,6 @@
+ </layout>
+ <layout>
+ <configItem>
+- <name>ir</name>
+- <description>Iranian</description>
+- <description xml:lang="ru">Фарси</description>
+- </configItem>
+- <variantList/>
+- </layout>
+- <layout>
+- <configItem>
+ <name>fi</name>
+ <description>Finnish</description>
+ <description xml:lang="bg">финландска</description>
+@@ -1431,6 +1448,50 @@
+ </layout>
+ <layout>
+ <configItem>
++ <name>ir</name>
++ <description>Iranian</description>
++ <description xml:lang="ru">Фарси</description>
++ </configItem>
++ <variantList/>
++ </layout>
++ <layout>
++ <configItem>
++ <name>ie</name>
++ <description>Irish</description>
++ </configItem>
++ <variantList>
++ <variant>
++ <configItem>
++ <name>CloGaelach</name>
++ <description>ie(CloGaelach) - No decription</description>
++ <description xml:lang="ru">CloGaelach</description>
++ </configItem>
++ </variant>
++ <variant>
++ <configItem>
++ <name>CloGaelachLaptop</name>
++ <description>ie(CloGaelachLaptop) - No decription</description>
++ <description xml:lang="ru">CloGaelach для настольных
ПК</description>
++ </configItem>
++ </variant>
++ <variant>
++ <configItem>
++ <name>UnicodeExpert</name>
++ <description>ie(UnicodeExpert) - No decription</description>
++ <description xml:lang="ru">уникод</description>
++ </configItem>
++ </variant>
++ <variant>
++ <configItem>
++ <name>laptop</name>
++ <description>ie(laptop) - No decription</description>
++ <description xml:lang="ru">для настольных ПК</description>
++ </configItem>
++ </variant>
++ </variantList>
++ </layout>
++ <layout>
++ <configItem>
+ <name>il</name>
+ <description>Israeli</description>
+ <description xml:lang="bg">израелска</description>
+@@ -1455,6 +1516,13 @@
+ </layout>
+ <layout>
+ <configItem>
++ <name>il_phonetic</name>
++ <description>Israeli (phonetic)</description>
++ </configItem>
++ <variantList/>
++ </layout>
++ <layout>
++ <configItem>
+ <name>it</name>
+ <description>Italian</description>
+ <description xml:lang="bg">италианска</description>
+@@ -2085,16 +2153,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 +2237,6 @@
+ </layout>
+ <layout>
+ <configItem>
+- <name>ie</name>
+- <description>ie - No decription</description>
+- <description xml:lang="ru">Ирландская</description>
+- </configItem>
+- <variantList>
+- <variant>
+- <configItem>
+- <name>CloGaelach</name>
+- <description>ie(CloGaelach) - No decription</description>
+- <description xml:lang="ru">CloGaelach</description>
+- </configItem>
+- </variant>
+- <variant>
+- <configItem>
+- <name>CloGaelachLaptop</name>
+- <description>ie(CloGaelachLaptop) - No decription</description>
+- <description xml:lang="ru">CloGaelach для настольных
ПК</description>
+- </configItem>
+- </variant>
+- <variant>
+- <configItem>
+- <name>UnicodeExpert</name>
+- <description>ie(UnicodeExpert) - No decription</description>
+- <description xml:lang="ru">уникод</description>
+- </configItem>
+- </variant>
+- <variant>
+- <configItem>
+- <name>laptop</name>
+- <description>ie(laptop) - No decription</description>
+- <description xml:lang="ru">для настольных ПК</description>
+- </configItem>
+- </variant>
+- </variantList>
+- </layout>
+- <layout>
+- <configItem>
+- <name>il_phonetic</name>
+- <description>il_phonetic - No decription</description>
+- <description xml:lang="bg">il_phonetic - без описание</description>
+- <description xml:lang="ru">Иврит, фонетическая</description>
+- </configItem>
+- <variantList/>
+- </layout>
+- <layout>
+- <configItem>
+ <name>sapmi</name>
+ <description>sapmi - No decription</description>
+ <description xml:lang="bg">sapmi - без описание</description>
+@@ -2257,8 +2280,14 @@
+ </configItem>
+ <option>
+ <configItem>
++ <name>grp:lswitch</name>
++ <description>Left Alt key switches group while pressed</description>
++ </configItem>
++ </option>
++ <option>
++ <configItem>
+ <name>grp:switch</name>
+- <description>R-Alt switches group while pressed</description>
++ <description>Right Alt key switches group while
pressed</description>
+ <description xml:lang="bg">Десният Alt сменя групата докато е
натиснат</description>
+ <description xml:lang="ru">Правая клавиша Alt переключает группу на
время нажатия</description>
+ </configItem>
+@@ -2464,6 +2493,12 @@
+ <description xml:lang="ru">Выбор 3-го уровня нажатием правой
клавиши Win</description>
+ </configItem>
+ </option>
++ <option>
++ <configItem>
++ <name>lv3:ralt_switch</name>
++ <description>Press Right Alt-key to choose 3rd level</description>
++ </configItem>
++ </option>
+ </group>
+ <group allowMultipleSelection="false">
+ <configItem>
+@@ -2617,7 +2652,7 @@
+ </option>
+ <option>
+ <configItem>
+- <name>altwin:meta_super</name>
++ <name>altwin:super_win</name>
+ <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 @@
+ </option>
+ <option>
+ <configItem>
+- <name>altwin:meta_hyper</name>
++ <name>altwin:hyper_win</name>
+ <description>Hyper is mapped to the Win-keys.</description>
+ <description xml:lang="bg">Hyper съответства на клавишите
Win</description>
+ <description xml:lang="ru">Hyper соответствует клавишам
Win</description>
