X Strike Force X.Org X11 SVN commit: r504 - in trunk/debian: . patches/general
Author: barbier
Date: 2005-08-06 17:51:09 -0500 (Sat, 06 Aug 2005)
New Revision: 504
Modified:
trunk/debian/changelog
trunk/debian/patches/general/099j_xkb_new_layouts.diff
trunk/debian/patches/general/099t_xkb_remove_hidden_attributes.diff
trunk/debian/patches/general/099z_xkb_level3_ralt_switch.diff
Log:
* Minor fixes in XKB related patches.
- Remove us(intl) from patch #099j_xkb_new_layouts, this variant
has been included upstream.
- Fix patch #099t_xkb_remove_hidden_attributes, it applies against
symbols/pc/us and not symbols/us.
- Update patch #099z_xkb_level3_ralt_switch to also replace
level3(ralt_switch_multikey) by level3(ralt_switch) in new layouts.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-08-05 22:23:21 UTC (rev 503)
+++ trunk/debian/changelog 2005-08-06 22:51:09 UTC (rev 504)
@@ -104,6 +104,15 @@
there was never an earlier version of the package in existence to depend
on.
+ [ Denis Barbier ]
+ * Minor fixes in XKB related patches.
+ - Remove us(intl) from patch #099j_xkb_new_layouts, this variant
+ has been included upstream.
+ - Fix patch #099t_xkb_remove_hidden_attributes, it applies against
+ symbols/pc/us and not symbols/us.
+ - Update patch #099z_xkb_level3_ralt_switch to also replace
+ level3(ralt_switch_multikey) by level3(ralt_switch) in new layouts.
+
-- Branden Robinson <branden@debian.org> Fri, 5 Aug 2005 17:20:49 -0500
xorg-x11 (6.8.2.dfsg.1-4) unstable; urgency=low
Modified: trunk/debian/patches/general/099j_xkb_new_layouts.diff
===================================================================
--- trunk/debian/patches/general/099j_xkb_new_layouts.diff 2005-08-05 22:23:21 UTC (rev 503)
+++ trunk/debian/patches/general/099j_xkb_new_layouts.diff 2005-08-06 22:51:09 UTC (rev 504)
@@ -17,9 +17,10 @@
+ Add ca, ch, hu, jp, mn and vn.
symbols/pc/us:
- + Add two new variants: 'intl' and 'alt-intl'. The latter is a strict
- replacement for us_intl, which will become obsolete soon. Providing
- all alternatives will help users to migrate to the new files.
+ + Add a new 'alt-intl' variant, which is a strict replacement for
+ us_intl, which will become obsolete soon. The 'intl' variant is
+ quite different, so providing all alternatives will help users
+ to migrate to the new files.
Layouts were taken (2004-10-08) from
http://freedesktop.org/cgi-bin/viewcvs.cgi/xlibs/xkbdesc/symbols/
@@ -1100,67 +1101,12 @@
diff -ruN xc-old/programs/xkbcomp/symbols/pc/us xc/programs/xkbcomp/symbols/pc/us
--- xc-old/programs/xkbcomp/symbols/pc/us 2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/us 2004-10-26 12:42:51.697979064 +0000
-@@ -120,3 +120,112 @@
+@@ -120,3 +120,57 @@
include "level3(ralt_switch_multikey)"
};
+
+
-+partial alphanumeric_keys
-+xkb_symbols "intl" {
-+
-+ name[Group1]= "US International";
-+
-+ include "pc/us(basic)"
-+
-+ // Alphanumeric section
-+ key <TLDE> { [dead_grave, dead_tilde, grave, asciitilde ] };
-+ key <AE01> { [ 1, exclam, exclamdown, onesuperior ] };
-+ key <AE02> { [ 2, at, twosuperior, dead_doubleacute ] };
-+ key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] };
-+ key <AE04> { [ 4, dollar, currency, sterling ] };
-+ key <AE05> { [ 5, percent, EuroSign ] };
-+ key <AE06> { [ 6, dead_circumflex, onequarter, asciicircum ] };
-+ key <AE07> { [ 7, ampersand, onehalf, dead_horn ] };
-+ key <AE08> { [ 8, asterisk, threequarters, dead_ogonek ] };
-+ key <AE09> { [ 9, parenleft, leftsinglequotemark, dead_breve ] };
-+ key <AE10> { [ 0, parenright, rightsinglequotemark, dead_abovering ] };
-+ key <AE11> { [ minus, underscore, yen, dead_belowdot ] };
-+ key <AE12> { [ equal, plus, multiply, division ] };
-+
-+ key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] };
-+ key <AD02> { [ w, W, aring, Aring ] };
-+ key <AD03> { [ e, E, eacute, Eacute ] };
-+ key <AD04> { [ r, R, registered, registered ] };
-+ key <AD05> { [ t, T, thorn, THORN ] };
-+ key <AD06> { [ y, Y, udiaeresis, Udiaeresis ] };
-+ key <AD07> { [ u, U, uacute, Uacute ] };
-+ key <AD08> { [ i, I, iacute, Iacute ] };
-+ key <AD09> { [ o, O, oacute, Oacute ] };
-+ key <AD10> { [ p, P, odiaeresis, Odiaeresis ] };
-+ key <AD11> { [ bracketleft, braceleft, guillemotleft, guillemotleft ] };
-+ key <AD12> { [bracketright, braceright, guillemotright,guillemotright ] };
-+
-+ key <AC01> { [ a, A, aacute, Aacute ] };
-+ key <AC02> { [ s, S, ssharp, section ] };
-+ key <AC03> { [ d, D, eth, ETH ] };
-+
-+ key <AC09> { [ l, L, oslash, Ooblique ] };
-+ key <AC10> { [ semicolon, colon, paragraph, degree ] };
-+ key <AC11> { [dead_acute, dead_diaeresis, quotedbl, apostrophe ] };
-+
-+ key <AB01> { [ z, Z, ae, AE ] };
-+ key <AB03> { [ c, C, copyright, cent ] };
-+ key <AB06> { [ n, N, ntilde, Ntilde ] };
-+ key <AB07> { [ m, M, mu, mu ] };
-+ key <AB08> { [ comma, less, ccedilla, Ccedilla ] };
-+ key <AB09> { [ period, greater, dead_abovedot, dead_caron ] };
-+ key <AB10> { [ slash, question, questiondown, dead_hook ] };
-+ key <BKSL> { [ backslash, bar, notsign, brokenbar ] };
-+
-+ include "level3(ralt_switch)"
-+};
-+
+// Based on symbols/us_intl keyboard map:
+// Dead-keys definition for a very simple US/ASCII layout.
+// by Conectiva (http://www.conectiva.com.br)
Modified: trunk/debian/patches/general/099t_xkb_remove_hidden_attributes.diff
===================================================================
--- trunk/debian/patches/general/099t_xkb_remove_hidden_attributes.diff 2005-08-05 22:23:21 UTC (rev 503)
+++ trunk/debian/patches/general/099t_xkb_remove_hidden_attributes.diff 2005-08-06 22:51:09 UTC (rev 504)
@@ -5,13 +5,14 @@
Not submitted upstream to X.Org.
-diff -ruN xc-old/programs/xkbcomp/symbols/us xc/programs/xkbcomp/symbols/us
---- xc-old/programs/xkbcomp/symbols/us 2005-05-08 23:28:59.000000000 -0400
-+++ xc/programs/xkbcomp/symbols/us 2005-07-02 16:51:11.000000000 -0400
-@@ -8,7 +8,7 @@
+Index: xc/programs/xkbcomp/symbols/pc/us
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/us.orig 2005-08-06 20:40:15.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/us 2005-08-06 20:43:54.000000000 +0000
+@@ -3,7 +3,7 @@
+ // $XFree86: xc/programs/xkbcomp/symbols/pc/us,v 1.6 2003/10/31 14:32:05 pascal Exp $
- // $XFree86: xc/programs/xkbcomp/symbols/us,v 3.14 2003/10/25 13:24:05 pascal Exp $
-
+ default
-partial hidden alphanumeric_keys modifier_keys
+partial alphanumeric_keys modifier_keys
xkb_symbols "basic" {
Modified: trunk/debian/patches/general/099z_xkb_level3_ralt_switch.diff
===================================================================
--- trunk/debian/patches/general/099z_xkb_level3_ralt_switch.diff 2005-08-05 22:23:21 UTC (rev 503)
+++ trunk/debian/patches/general/099z_xkb_level3_ralt_switch.diff 2005-08-06 22:51:09 UTC (rev 504)
@@ -160,6 +160,13 @@
};
partial default alphanumeric_keys
+@@ -57,5 +57,5 @@
+ key <BKSL> { [ numbersign, dead_tilde, bar, bar ] };
+ key <LSGT> { [ backslash, bar, bar, bar ] };
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
diff -urN xc/programs/xkbcomp.orig/symbols/pc/hr xc/programs/xkbcomp/symbols/pc/hr
--- xc/programs/xkbcomp.orig/symbols/pc/hr 2005-01-05 20:42:32.923371936 +1100
+++ xc/programs/xkbcomp/symbols/pc/hr 2005-01-05 20:42:39.833321464 +1100
@@ -379,6 +386,13 @@
};
// Turkish Alt-Q Layout
+@@ -149,5 +149,5 @@
+ key <AB03> { [ c, C, ccedilla, Ccedilla ] };
+ key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
diff -urN xc/programs/xkbcomp.orig/symbols/pc/us_intl xc/programs/xkbcomp/symbols/pc/us_intl
--- xc/programs/xkbcomp.orig/symbols/pc/us_intl 2005-01-05 20:42:32.929371024 +1100
+++ xc/programs/xkbcomp/symbols/pc/us_intl 2005-01-05 20:42:40.214263552 +1100
@@ -401,3 +415,75 @@
};
partial alphanumeric_keys
+Index: xc/programs/xkbcomp/symbols/pc/dvorak
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/dvorak.orig 2005-08-06 18:26:11.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/dvorak 2005-08-06 20:15:12.000000000 +0000
+@@ -61,7 +61,7 @@
+ key <AB09> { [ v, V ] };
+ key <AB10> { [ z, Z ] };
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
+
+ // Norwegian Dvorak
+@@ -221,7 +221,7 @@
+ key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
+ key <LSGT> { [ ccedilla, Ccedilla ] };
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
+
+
+Index: xc/programs/xkbcomp/symbols/pc/dz
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/dz.orig 2005-08-06 18:26:11.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/dz 2005-08-06 20:15:18.000000000 +0000
+@@ -83,5 +83,5 @@
+ // space
+ key <SPCE> { [ U0F0B, space, U0F0C, U00A0 ] };
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
+Index: xc/programs/xkbcomp/symbols/pc/fo
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/fo.orig 2005-08-06 18:26:11.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/fo 2005-08-06 20:14:28.000000000 +0000
+@@ -29,7 +29,7 @@
+
+ key <BKSL> { [apostrophe, asterisk, dead_doubleacute, multiply ] };
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
+
+ partial alphanumeric_keys
+Index: xc/programs/xkbcomp/symbols/pc/sr
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/sr.orig 2005-08-06 18:26:11.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/sr 2005-08-06 20:14:38.000000000 +0000
+@@ -19,7 +19,7 @@
+ include "pc/sr(level3)"
+ include "pc/sr(common)"
+ include "pc/sr(cyralpha)"
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
+
+ partial alphanumeric_keys
+Index: xc/programs/xkbcomp/symbols/pc/us
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/us.orig 2005-08-06 20:00:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/us 2005-08-06 20:09:22.000000000 +0000
+@@ -118,7 +118,7 @@
+ key <AB10> { [ slash, question, questiondown, dead_hook ] };
+ key <BKSL> { [ backslash, bar, notsign, brokenbar ] };
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
+
+
Reply to: