X Strike Force XFree86 SVN commit: r1826 - in trunk/debian: . patches
Author: barbier
Date: 2004-09-18 03:21:17 -0500 (Sat, 18 Sep 2004)
New Revision: 1826
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
Log:
rules/xfree86: Remove special casing for us_intl layout (Closes: #234085)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-09-18 07:39:44 UTC (rev 1825)
+++ trunk/debian/CHANGESETS 2004-09-18 08:21:17 UTC (rev 1826)
@@ -38,10 +38,11 @@
Veres Lajos)
+ rules/xfree86: The lv3:ralt_switch option, which does exist in
xfree86.lst, was forgotten in this file.
++ rules/xfree86: Remove special casing for us_intl layout
+ rules/xfree86.{lst,xml}: Options altwin:meta_super and altwin:meta_hyper
are replaced by their right names altwin:super_win and altwin:hyper_win.
+ rules/xfree86.{lst,xml}: Perform changes to synchronize these files.
- 1822, 1825
+ 1822, 1825, 1826
Add FAQ entry: My keyboard configuration worked with XFree86 4.2, why is
it messed up now?
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-09-18 07:39:44 UTC (rev 1825)
+++ trunk/debian/changelog 2004-09-18 08:21:17 UTC (rev 1826)
@@ -5,8 +5,8 @@
* Update Danish debconf template translations (thanks, Claus Hindsgaul).
(Closes: #270503)
- * Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04).
- (Closes: #271326)
+ * Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04)
+ (Closes: #271326, #234085)
* The fix about altwin introduced in 4.3.0.dfsg.1-1 is reverted, Meta_*
keysyms must be removed from shift level of Alt keys when altwin:meta_win
Modified: trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
===================================================================
--- trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-09-18 07:39:44 UTC (rev 1825)
+++ trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-09-18 08:21:17 UTC (rev 1826)
@@ -12,6 +12,7 @@
forgotten in this file.
+ Add support for hu_US layout in old format (thanks, Veres Lajos)
(Closes: #247463)
+ + Remove special casing for us_intl layout to load new format file.
rules/xfree86.lst rules/xfree86.xml:
+ Options altwin:meta_super and altwin:meta_hyper are replaced by
@@ -34,7 +35,15 @@
// If you want non-latin layouts implicitly include the en_US layout
// uncomment lines below
-@@ -157,6 +157,7 @@
+@@ -65,7 +65,6 @@
+ ! model layout = symbols
+ pc98 nec/jp = nec/jp(pc98)
+ abnt2 br = us(pc101)+br
+- $pcmodels us_intl = us(%m)+us_intl
+ $mac us = macintosh/us(extended)
+ $mac en_US = macintosh/us(extended)
+ $mac * = macintosh/us(extended)+macintosh/%l%(v)
+@@ -157,6 +156,7 @@
lv3:win_switch = +level3(win_switch)
lv3:lwin_switch = +level3(lwin_switch)
lv3:rwin_switch = +level3(rwin_switch)
Reply to: