[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r3848 - in trunk/data/xkb-data/debian: . patches



Author: barbier
Date: 2006-10-17 14:24:17 -0400 (Tue, 17 Oct 2006)
New Revision: 3848

Modified:
   trunk/data/xkb-data/debian/changelog
   trunk/data/xkb-data/debian/patches/revert_bz8572.diff
Log:
debian/patches/revert_bz8572.diff: Sync to CVS.


Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog	2006-10-17 18:04:24 UTC (rev 3847)
+++ trunk/data/xkb-data/debian/changelog	2006-10-17 18:24:17 UTC (rev 3848)
@@ -1,15 +1,18 @@
-xkeyboard-config (0.9-3) UNRELEASED; urgency=low
+xkeyboard-config (0.9-3) UNRELEASED; urgency=high
 
   * debian/patches/resync_rules_base.diff: Regenerate to fix FTBFS.
     Closes: #393166  Thanks Andreas Jochens.
+    Urgency set to high because of the FTBFS.
 
   + debian/patches/po.diff: Update Slovenian PO file.
 
   + debian/patches/bz8668.diff: New patch to fix Ctrl-Alt-Backspace
     with Macintosh us layout.
 
- -- Denis Barbier <barbier@debian.org>  Sun, 15 Oct 2006 14:45:11 +0200
+  * debian/patches/revert_bz8572.diff: Sync to CVS.
 
+ -- Denis Barbier <barbier@debian.org>  Tue, 17 Oct 2006 19:52:39 +0200
+
 xkeyboard-config (0.9-2) unstable; urgency=low
 
   + debian/patches/po.diff: Update Hungarian PO file.

Modified: trunk/data/xkb-data/debian/patches/revert_bz8572.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/revert_bz8572.diff	2006-10-17 18:04:24 UTC (rev 3847)
+++ trunk/data/xkb-data/debian/patches/revert_bz8572.diff	2006-10-17 18:24:17 UTC (rev 3848)
@@ -3,6 +3,8 @@
   combinations.  This seems to be an X server bug, but this
   patch is added until this issue is fixed.  Closes: #392911.
 
+Fixed in CVS.
+
 Index: xkb-data/symbols/level3
 ===================================================================
 --- xkb-data.orig/symbols/level3
@@ -16,15 +18,6 @@
  };
  
  partial modifier_keys
-@@ -55,7 +55,7 @@
-     type[Group1]="ONE_LEVEL",
-     symbols[Group1] = [ ISO_Level3_Shift ]
-     };
--  modifier_map Mod5   { <LALT> };
-+  modifier_map Mod5   { ISO_Level3_Shift };
- };
- 
- // using the level(switch) map, the right Control key temporarily
 @@ -66,7 +66,7 @@
      type[Group1]="ONE_LEVEL",
      symbols[Group1] = [ ISO_Level3_Shift ]



Reply to: