X Strike Force XFree86 SVN commit: r1452 - in trunk/debian: . patches
Author: branden
Date: 2004-05-27 04:02:54 -0500 (Thu, 27 May 2004)
New Revision: 1452
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
Log:
Fix breakage of NumLock under XKB, caused by crack-addled patch that
warped the XKB types/basic file 7 years backwards in time.
(Closes: #251119)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-27 08:57:41 UTC (rev 1451)
+++ trunk/debian/CHANGESETS 2004-05-27 09:02:54 UTC (rev 1452)
@@ -11,4 +11,7 @@
Begin new changelog entry.
1445
+#251119: Fix breakage of NumLock.
+ 1452
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-05-27 08:57:41 UTC (rev 1451)
+++ trunk/debian/TODO 2004-05-27 09:02:54 UTC (rev 1452)
@@ -12,8 +12,6 @@
These items are listed in descending order of priority; that is, the most
important items come first.
-#251119: Fix breakage of NumLock.
-
Post 4.3.0-1
------------
* Re-do migration of /usr/X11R6/lib/X11/{app-defaults,xkb}:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-27 08:57:41 UTC (rev 1451)
+++ trunk/debian/changelog 2004-05-27 09:02:54 UTC (rev 1452)
@@ -1,8 +1,10 @@
xfree86 (4.3.0.dfsg.1-2+SVN) unstable; urgency=low
- * Dummy entry; replace with first actual change.
+ * Fix breakage of NumLock under XKB, caused by crack-addled patch that
+ warped the XKB types/basic file 7 years backwards in time.
+ (Closes: #251119)
- -- Branden Robinson <branden@debian.org> Tue, 25 May 2004 18:11:59 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 27 May 2004 03:58:57 -0500
xfree86 (4.3.0.dfsg.1-2) unstable; urgency=low
Modified: trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-05-27 08:57:41 UTC (rev 1451)
+++ trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-05-27 09:02:54 UTC (rev 1452)
@@ -2576,77 +2576,6 @@
+ include "level3(ralt_switch_multikey)"
};
-
-Index: xc/programs/xkbcomp/types/basic
-===================================================================
-RCS file: /cvs/xc/programs/xkbcomp/types/basic,v
-retrieving revision 1.1.1.4
-retrieving revision 1.1
-diff -u -r1.1.1.4 -r1.1
---- xc/programs/xkbcomp/types/basic 16 Jan 2001 23:00:29 -0000 1.1.1.4
-+++ xc/programs/xkbcomp/types/basic 27 Apr 1994 07:21:51 -0000 1.1
-@@ -1,39 +1,28 @@
--// $Xorg: basic,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
--default xkb_types "basic" {
-+// $XConsortium: basic,v 1.3 94/04/08 16:00:43 erik Exp $
-+xkb_types "Common"
-
-- // Fairly standard definitions for
-- // the four required key types
-+virtual_modifiers NumLock;
-
-- virtual_modifiers NumLock;
--
-- type "ONE_LEVEL" {
-- modifiers = None;
-- map[None] = Level1;
-- level_name[Level1]= "Any";
-- };
--
-- type "TWO_LEVEL" {
-- modifiers = Shift;
-- map[Shift] = Level2;
-- level_name[Level1] = "Base";
-- level_name[Level2] = "Shift";
-- };
-+type "ONE_LEVEL" {
-+ modifiers = None;
-+ map[None] = Level1;
-+ level_name[Level1]= "Any";
-+};
-
-- type "ALPHABETIC" {
-- modifiers = Shift+Lock;
-- map[Shift] = Level2;
-- preserve[Lock]= Lock;
-- level_name[Level1] = "Base";
-- level_name[Level2] = "Caps";
-- };
-+type "TWO_LEVEL" {
-+ modifiers = Shift;
-+ map[Shift] = Level2;
-+ level_name[Level1] = "Base";
-+ level_name[Level2] = "Shift";
-+};
-
-- type "KEYPAD" {
-- modifiers = Shift+NumLock;
-- map[None] = Level1;
-- map[Shift] = Level2;
-- map[NumLock] = Level2;
-- map[Shift+NumLock] = Level1;
-- level_name[Level1] = "Base";
-- level_name[Level2] = "Number";
-- };
-+type "KEYPAD" {
-+ modifiers = Shift+NumLock;
-+ map[None] = Level1;
-+ map[Shift] = Level2;
-+ map[NumLock] = Level1;
-+ map[Shift+NumLock] = Level2;
-+ level_name[Level1] = "Base";
-+ level_name[Level2] = "Number";
- };
-+
--- xc/programs/xkbcomp~/rules/xfree86.lst 2004-05-17 03:43:03.000000000 -0500
+++ xc/programs/xkbcomp/rules/xfree86.lst 2004-05-17 03:44:04.000000000 -0500
@@ -4,7 +4,7 @@
Reply to: