X Strike Force XFree86 SVN commit: r1525 - in trunk/debian: . patches
Author: branden
Date: 2004-06-08 01:55:06 -0500 (Tue, 08 Jun 2004)
New Revision: 1525
Added:
trunk/debian/patches/091_xkb_implement_compose:caps.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
Log:
Implement XkbOption "compose:caps" (make the Caps Lock key a compose key,
a.k.a. Multi_key), courtesy of Andrew Suffield. (Closes: #251310)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-06-08 06:35:29 UTC (rev 1524)
+++ trunk/debian/CHANGESETS 2004-06-08 06:55:06 UTC (rev 1525)
@@ -150,4 +150,8 @@
(Closes: #201737)
1524
+Implement XkbOption "compose:caps" (make the Caps Lock key a compose key,
+a.k.a. Multi_key), courtesy of Andrew Suffield. (Closes: #251310)
+ 1525
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-06-08 06:35:29 UTC (rev 1524)
+++ trunk/debian/TODO 2004-06-08 06:55:06 UTC (rev 1525)
@@ -20,7 +20,6 @@
* #245246: Apply hot pokers to Ben Collins until we extract a working patch for
XAA and Render support for the sunffb driver. Mmmm, burning manflesh...
(Ben Collins pinged for status on 2004-06-03, and again on 2004-06-07.)
-* #251310: xlibs: implement compose:caps
4.3.0.dfsg.1-6
--------------
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-06-08 06:35:29 UTC (rev 1524)
+++ trunk/debian/changelog 2004-06-08 06:55:06 UTC (rev 1525)
@@ -142,8 +142,11 @@
of AltGr+<AE03) to "numbersign" can be used.
(Closes: #201737)
- -- Branden Robinson <branden@debian.org> Tue, 8 Jun 2004 01:17:09 -0500
+ * Implement XkbOption "compose:caps" (make the Caps Lock key a compose key,
+ a.k.a. Multi_key), courtesy of Andrew Suffield. (Closes: #251310)
+ -- Branden Robinson <branden@debian.org> Tue, 8 Jun 2004 01:50:36 -0500
+
xfree86 (4.3.0.dfsg.1-4) unstable; urgency=medium
* The "thanks for the 'testing'" release.
Added: trunk/debian/patches/091_xkb_implement_compose:caps.diff
===================================================================
--- trunk/debian/patches/091_xkb_implement_compose:caps.diff 2004-06-08 06:35:29 UTC (rev 1524)
+++ trunk/debian/patches/091_xkb_implement_compose:caps.diff 2004-06-08 06:55:06 UTC (rev 1525)
@@ -0,0 +1,51 @@
+$Id$
+
+Implement option to place Compose key ("Multi_key") on <CAPS> key. See
+Debian #251310.
+
+This patch by Andrew Suffield and Branden Robinson.
+
+--- xc/programs/xkbcomp/symbols/compose~ 2004-05-27 16:46:28.000000000 -0500
++++ xc/programs/xkbcomp/symbols/compose 2004-05-27 16:47:22.000000000 -0500
+@@ -15,3 +15,7 @@
+ key <MENU> { [ Multi_key, Multi_key ] };
+ };
+
++partial modifier_keys
++xkb_symbols "caps" {
++ key <CAPS> { [ Multi_key, Multi_key ] };
++};
+--- xc/programs/xkbcomp/rules/xfree86~ 2004-05-27 16:55:39.000000000 -0500
++++ xc/programs/xkbcomp/rules/xfree86 2004-05-27 16:55:47.000000000 -0500
+@@ -170,6 +170,7 @@
+ compose:ralt = +compose(ralt)
+ compose:rwin = +compose(rwin)
+ compose:menu = +compose(menu)
++ compose:caps = +compose(caps)
+
+ ! option = compat
+ grp_led:num = +leds(num)
+--- xc/programs/xkbcomp/rules/xfree86.lst~ 2004-06-08 01:47:07.000000000 -0500
++++ xc/programs/xkbcomp/rules/xfree86.lst 2004-06-08 01:47:42.000000000 -0500
+@@ -251,3 +251,4 @@
+ compose:ralt Right Alt is Compose
+ compose:rwin Right Win-key is Compose
+ compose:menu Menu is Compose
++ compose:caps Caps Lock is Compose
+--- xc/programs/xkbcomp/rules/xfree86.xml~ 2004-06-08 01:47:09.000000000 -0500
++++ xc/programs/xkbcomp/rules/xfree86.xml 2004-06-08 01:48:30.000000000 -0500
+@@ -2661,6 +2661,14 @@
+ <description xml:lang="ru">Клавиша Menu соответствует клавише Compose</description>
+ </configItem>
+ </option>
++ <option>
++ <configItem>
++ <name>compose:caps</name>
++ <description>Caps Lock is Compose</description>
++ <description xml:lang="bg">Клавиша Caps Lock фунцкионира като Compose</description>
++ <description xml:lang="ru">Клавиша Caps Lock соответствует клавише Compose</description>
++ </configItem>
++ </option>
+ </group>
+ </optionList>
+ </xkbConfigRegistry>
Property changes on: trunk/debian/patches/091_xkb_implement_compose:caps.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: