X Strike Force XFree86 SVN commit: r1829 - in trunk/debian: . patches
Author: branden
Date: 2004-09-18 13:44:56 -0500 (Sat, 18 Sep 2004)
New Revision: 1829
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
Log:
(cosmetic) Tidy up recent XKB change descriptions.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-09-18 18:43:15 UTC (rev 1828)
+++ trunk/debian/CHANGESETS 2004-09-18 18:44:56 UTC (rev 1829)
@@ -9,9 +9,9 @@
files anywhere.)
Miscellaneous cosmetic fixes.
- 1811, 1812, 1815, 1816, 1828
+ 1811, 1812, 1815, 1816, 1828, 1829
-Update Danish debconf template translations (thanks, Claus Hindsgaul)
+Update Danish debconf template translations (thanks, Claus Hindsgaul).
1806
In the Xsession script, attempt to create a file of non-zero length in
@@ -22,30 +22,32 @@
is defined. Fixes FTBFS on s390.
1814
-Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04).
+Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04). This
+makes us_intl multi-layout aware, and binds the right Meta key to
+Mode_Switch. (Closes: #271326, #234085)
1820, 1824
-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
-or altwin:left_meta_win are used. Otherwise XKB-unaware applications
-may believe that mod1 and mod4 are bound to Meta keys.
+Revert upstream change to altwin behavior applied in 4.3.0.dfsg.1-1.
+The Meta_* keysyms must be removed from the shift level of Alt keys when
+altwin:meta_win or altwin:left_meta_win are used; otherwise, XKB-unaware
+applications (like GNU Emacs) may believe that mod1 and mod4 are bound to
+Meta keys.
1821
Fix inconsistencies in rules/xfree86* files:
+ rules/xfree86: List in $oldlayouts all layouts which are currently not
- available in xlibs Debian package under the new multilayout format.
-+ rules/xfree86: Declare hu_US layout as being in old format (thanks,
- 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.
+ multi-layout aware in the Debian xlibs package, including hu_US (thanks,
+ Veres Lajos). (Closes: #247463, #270810)
++ rules/xfree86: Support the lv3:ralt_switch option, which exists in
+ xfree86.lst but was forgotten in this file.
++ rules/xfree86.{lst,xml}: Replace the options altwin:meta_super and
+ altwin:meta_hyper with the correct names altwin:super_win and
+ altwin:hyper_win. (Closes: #271259)
++ rules/xfree86.{lst,xml}: Synchronize these files.
1822, 1825, 1826
-Add FAQ entry: My keyboard configuration worked with XFree86 4.2, why is
-it messed up now?
+Add FAQ entry: My keyboard configuration worked with XFree86 4.2; why is
+it messed up now? (Closes: #259740)
1823
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-09-18 18:43:15 UTC (rev 1828)
+++ trunk/debian/changelog 2004-09-18 18:44:56 UTC (rev 1829)
@@ -5,32 +5,33 @@
* 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, #234085)
+ * Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04). This
+ makes us_intl multi-layout aware, and binds the right Meta key to
+ Mode_Switch. (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
- or altwin:left_meta_win are used. Otherwise XKB-unaware applications
- may believe that mod1 and mod4 are bound to Meta keys.
+ * Revert upstream change to altwin behavior applied in 4.3.0.dfsg.1-1.
+ The Meta_* keysyms must be removed from the shift level of Alt keys when
+ altwin:meta_win or altwin:left_meta_win are used; otherwise, XKB-unaware
+ applications (like GNU Emacs) may believe that mod1 and mod4 are bound to
+ Meta keys.
* Fix inconsistencies in rules/xfree86* files:
+ rules/xfree86: List in $oldlayouts all layouts which are currently not
- available in xlibs Debian package under the new multilayout format.
- (Closes: #270810)
- + rules/xfree86: The lv3:ralt_switch option, which does exist in
- xfree86.lst, was forgotten in this file.
- + 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.
- (Closes: #271259)
- + rules/xfree86.{lst,xml}: Perform changes to synchronize these files.
+ multi-layout aware in the Debian xlibs package, including hu_US (thanks,
+ Veres Lajos). (Closes: #247463, #270810)
+ + rules/xfree86: Support the lv3:ralt_switch option, which exists in
+ xfree86.lst but was forgotten in this file.
+ + rules/xfree86: Remove special case that causes PC keyboard models with
+ the us_intl layout to load the us layout and add the us_intl layout to
+ it.
+ + rules/xfree86.{lst,xml}: Replace the options altwin:meta_super and
+ altwin:meta_hyper with the correct names altwin:super_win and
+ altwin:hyper_win. (Closes: #271259)
+ + rules/xfree86.{lst,xml}: Synchronize these files.
- * Add FAQ entry: My keyboard configuration worked with XFree86 4.2,
- why is it messed up now?
- (Closes: #259740)
+ * Add FAQ entry: My keyboard configuration worked with XFree86 4.2; why is
+ it messed up now? (Closes: #259740)
- * Declare hu_US layout as being in old format (thanks, Veres Lajos)
- (Closes: #247463)
-
Changes by Branden Robinson:
* In the Xsession script, attempt to create a file of non-zero length in
@@ -503,7 +504,7 @@
* Update Italian debconf template translations (thanks, Danilo Piazzalunga).
(Closes: #270126)
- * Update French debconf template translations (thanks, Clement Stenac)
+ * Update French debconf template translations (thanks, Clement Stenac).
-- Fabio M. Di Nitto <fabbione@fabbione.net> Mon, 06 Sep 2004 09:54:18 +0200
Modified: trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
===================================================================
--- trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-09-18 18:43:15 UTC (rev 1828)
+++ trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-09-18 18:44:56 UTC (rev 1829)
@@ -5,24 +5,19 @@
Fix inconsistencies in rules/xfree86* files.
rules/xfree86:
- + List in $oldlayouts all layouts which are currently not available
- in xlibs Debian package under the new multilayout format.
- (Closes: #271259)
- + The lv3:ralt_switch option, which does exist in xfree86.lst, was
+ + List in $oldlayouts all layouts which are currently not multi-layout
+ aware in the Debian xlibs package, including hu_US (thanks, Veres
+ Lajos). (Closes: #247463, #270810)
+ + Support the lv3:ralt_switch option, which exists in xfree86.lst but was
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.
+ + Remove special case that causes PC keyboard models with the us_intl
+ layout to load the us layout and add the us_intl layout to it.
-rules/xfree86.lst rules/xfree86.xml:
- + Options altwin:meta_super and altwin:meta_hyper are replaced by
- their right names altwin:super_win and altwin:hyper_win in
- rules/xfree86.lst and rules/xfree86.xml
- (Closes: #271259)
+rules/xfree86.{lst,xml}:
+ + Replace the options altwin:meta_super and altwin:meta_hyper with the
+ correct names altwin:super_win and altwin:hyper_win. (Closes: #271259)
+ + Synchronize these files.
-rules/xfree86.lst rules/xfree86.xml:
- + Perform changes to synchronize these files.
-
diff -ruN xc-old/programs/xkbcomp/rules/xfree86 xc/programs/xkbcomp/rules/xfree86
--- xc-old/programs/xkbcomp/rules/xfree86 Thu Sep 16 17:03:12 2004
+++ xc/programs/xkbcomp/rules/xfree86 Fri Sep 17 14:26:43 2004
Reply to: