Author: barbier
Date: 2006-01-11 17:08:33 -0500 (Wed, 11 Jan 2006)
New Revision: 1067
Added:
trunk/debian/patches/general/013_xkb_drop_rules_xorg_duplicates.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/general/091_xkb_implement_compose:caps.diff
trunk/debian/patches/series
Log:
Add general/013_xkb_drop_rules_xorg_duplicates.diff to remove duplicate
definitions from /etc/X11/xkb/rules/xorg, and update
general/091_xkb_implement_compose:caps.diff
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-11 21:19:15 UTC (rev 1066)
+++ trunk/debian/changelog 2006-01-11 22:08:33 UTC (rev 1067)
@@ -22,8 +22,11 @@
* Add general/086_enable_ca_variants.diff so that variants of the ca
layout can be selected. Thanks Felix-Antoine Bourbonnais
(closes: #347496)
+ * Add general/013_xkb_drop_rules_xorg_duplicates.diff to remove duplicate
+ definitions from /etc/X11/xkb/rules/xorg, and update
+ general/091_xkb_implement_compose:caps.diff
- -- David Martínez Moreno <[EMAIL PROTECTED]> Wed, 11 Jan 2006 13:06:52 +0100
+ -- Denis Barbier <[EMAIL PROTECTED]> Wed, 11 Jan 2006 23:07:44 +0100
xorg-x11 (6.9.0.dfsg.1-3) unstable; urgency=low
Added: trunk/debian/patches/general/013_xkb_drop_rules_xorg_duplicates.diff
===================================================================
--- trunk/debian/patches/general/013_xkb_drop_rules_xorg_duplicates.diff
2006-01-11 21:19:15 UTC (rev 1066)
+++ trunk/debian/patches/general/013_xkb_drop_rules_xorg_duplicates.diff
2006-01-11 22:08:33 UTC (rev 1067)
@@ -0,0 +1,64 @@
+Index: xc/programs/xkbcomp/rules/xorg
+===================================================================
+--- xc/programs/xkbcomp/rules/xorg.orig
++++ xc/programs/xkbcomp/rules/xorg
+@@ -943,59 +943,6 @@
+ eurosign:e = +eurosign(e)
+ eurosign:5 = +eurosign(5)
+ eurosign:2 = +eurosign(2)
+- grp:switch = +group(switch)
+- grp:lswitch = +group(lswitch)
+- grp:win_switch = +group(win_switch)
+- grp:lwin_switch = +group(lwin_switch)
+- grp:rwin_switch = +group(rwin_switch)
+- grp:toggle = +group(toggle)
+- grp:shifts_toggle = +group(shifts_toggle)
+- grp:ctrls_toggle = +group(ctrls_toggle)
+- grp:alts_toggle = +group(alts_toggle)
+- grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
+- grp:caps_toggle = +group(caps_toggle)
+- grp:shift_caps_toggle = +group(shift_caps_toggle)
+- grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
+- grp:alt_shift_toggle = +group(alt_shift_toggle)
+- grp:menu_toggle = +group(menu_toggle)
+- grp:lwin_toggle = +group(lwin_toggle)
+- grp:rwin_toggle = +group(rwin_toggle)
+- grp:lshift_toggle = +group(lshift_toggle)
+- grp:rshift_toggle = +group(rshift_toggle)
+- grp:lctrl_toggle = +group(lctrl_toggle)
+- grp:rctrl_toggle = +group(rctrl_toggle)
+- grp:lalt_toggle = +group(lalt_toggle)
+- lv3:switch = +level3(switch)
+- lv3:ralt_switch = +level3(ralt_switch)
+- lv3:lalt_switch = +level3(lalt_switch)
+- lv3:alt_switch = +level3(alt_switch)
+- lv3:menu_switch = +level3(menu_switch)
+- lv3:win_switch = +level3(win_switch)
+- lv3:lwin_switch = +level3(lwin_switch)
+- lv3:rwin_switch = +level3(rwin_switch)
+- caps:capslock = +capslock(capslock)
+- caps:shiftlock = +capslock(shiftlock)
+- caps:grouplock = +capslock(grouplock)
+- ctrl:nocaps = +ctrl(nocaps)
+- ctrl:swapcaps = +ctrl(swapcaps)
+- ctrl:ctrl_ac = +ctrl(ctrl_ac)
+- ctrl:ctrl_aa = +ctrl(ctrl_aa)
+- ctrl:ctrl_ra = +ctrl(ctrl_ra)
+- altwin:menu = +altwin(menu)
+- altwin:meta_alt = +altwin(meta_alt)
+- altwin:meta_win = +altwin(meta_win)
+- altwin:left_meta_win = +altwin(left_meta_win)
+- altwin:super_win = +altwin(super_win)
+- altwin:hyper_win = +altwin(hyper_win)
+- altwin:alt_super_win = +altwin(alt_super_win)
+- compose:ralt = +compose(ralt)
+- compose:rwin = +compose(rwin)
+- compose:menu = +compose(menu)
+- compose:rctrl = +compose(rctrl)
+- srvrkeys:none = +srvr_ctrl(no_srvr_keys)
+- eurosign:e = +eurosign(e)
+- eurosign:5 = +eurosign(5)
+- eurosign:2 = +eurosign(2)
+
+ ! option = compat
+ grp_led:num = +lednum(group_lock)
Modified: trunk/debian/patches/general/091_xkb_implement_compose:caps.diff
===================================================================
--- trunk/debian/patches/general/091_xkb_implement_compose:caps.diff
2006-01-11 21:19:15 UTC (rev 1066)
+++ trunk/debian/patches/general/091_xkb_implement_compose:caps.diff
2006-01-11 22:08:33 UTC (rev 1067)
@@ -9,9 +9,9 @@
Index: xc/programs/xkbcomp/rules/xorg
===================================================================
---- xc/programs/xkbcomp/rules/xorg.orig 2005-10-18 21:34:56.000000000
-0400
-+++ xc/programs/xkbcomp/rules/xorg 2005-10-18 22:02:22.000000000 -0400
-@@ -940,6 +940,7 @@
+--- xc/programs/xkbcomp/rules/xorg.orig
++++ xc/programs/xkbcomp/rules/xorg
+@@ -939,6 +939,7 @@
compose:rwin = +compose(rwin)
compose:menu = +compose(menu)
compose:rctrl = +compose(rctrl)
@@ -19,19 +19,11 @@
srvrkeys:none = +srvr_ctrl(no_srvr_keys)
eurosign:e = +eurosign(e)
eurosign:5 = +eurosign(5)
-@@ -993,6 +994,7 @@
- compose:rwin = +compose(rwin)
- compose:menu = +compose(menu)
- compose:rctrl = +compose(rctrl)
-+ compose:caps = +compose(caps)
- srvrkeys:none = +srvr_ctrl(no_srvr_keys)
- eurosign:e = +eurosign(e)
- eurosign:5 = +eurosign(5)
Index: xc/programs/xkbcomp/rules/xorg.lst
===================================================================
---- xc/programs/xkbcomp/rules/xorg.lst.orig 2005-10-18 21:35:51.000000000
-0400
-+++ xc/programs/xkbcomp/rules/xorg.lst 2005-10-18 22:03:01.000000000 -0400
-@@ -402,6 +402,7 @@
+--- xc/programs/xkbcomp/rules/xorg.lst.orig
++++ xc/programs/xkbcomp/rules/xorg.lst
+@@ -403,6 +403,7 @@
compose:rwin Right Win-key is Compose.
compose:menu Menu is Compose.
compose:rctrl Right Ctrl is Compose.
@@ -41,9 +33,9 @@
srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a
server.
Index: xc/programs/xkbcomp/rules/xorg.xml
===================================================================
---- xc/programs/xkbcomp/rules/xorg.xml.orig 2005-10-18 21:34:56.000000000
-0400
-+++ xc/programs/xkbcomp/rules/xorg.xml 2005-10-18 22:01:16.000000000 -0400
-@@ -7916,6 +7916,14 @@
+--- xc/programs/xkbcomp/rules/xorg.xml.orig
++++ xc/programs/xkbcomp/rules/xorg.xml
+@@ -7922,6 +7922,14 @@
<description xml:lang="vi">Thêm ký hiệu đồng Euro vào phím
2.</description>
</configItem>
</option>
@@ -60,8 +52,8 @@
</xkbConfigRegistry>
Index: xc/programs/xkbcomp/symbols/compose
===================================================================
---- xc/programs/xkbcomp/symbols/compose.orig 2005-10-18 19:45:33.000000000
-0400
-+++ xc/programs/xkbcomp/symbols/compose 2005-10-18 22:03:46.000000000
-0400
+--- xc/programs/xkbcomp/symbols/compose.orig
++++ xc/programs/xkbcomp/symbols/compose
@@ -22,3 +22,8 @@
xkb_symbols "rctrl" {
key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-01-11 21:19:15 UTC (rev 1066)
+++ trunk/debian/patches/series 2006-01-11 22:08:33 UTC (rev 1067)
@@ -12,6 +12,7 @@
general/010_donot_build_XpConfig.diff -p0
general/011a_recognize_glibc_2.3.2_locale_names.diff -p0
general/012_Xaw_StripChart_fix.diff -p0
+general/013_xkb_drop_rules_xorg_duplicates.diff -p0
general/013a_xkb_symbols_euro_support.diff -p0
general/014_startx_hostname_fix.diff -p0
general/015_startx_dummy_fix.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
