X Strike Force X.Org X11 SVN commit: r1066 - in trunk/debian: . patches patches/general
Author: barbier
Date: 2006-01-11 16:19:15 -0500 (Wed, 11 Jan 2006)
New Revision: 1066
Added:
trunk/debian/patches/general/086_enable_ca_variants.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
* Add general/086_enable_ca_variants.diff so that variants of the ca
layout can be selected. Thanks Felix-Antoine Bourbonnais
(closes: #347496)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-11 21:10:20 UTC (rev 1065)
+++ trunk/debian/changelog 2006-01-11 21:19:15 UTC (rev 1066)
@@ -18,6 +18,11 @@
* MANIFEST updates for mips and mipsel over evdev manpage that was added for
last upload
+ [ Denis Barbier ]
+ * Add general/086_enable_ca_variants.diff so that variants of the ca
+ layout can be selected. Thanks Felix-Antoine Bourbonnais
+ (closes: #347496)
+
-- David Martínez Moreno <ender@debian.org> Wed, 11 Jan 2006 13:06:52 +0100
xorg-x11 (6.9.0.dfsg.1-3) unstable; urgency=low
Added: trunk/debian/patches/general/086_enable_ca_variants.diff
===================================================================
--- trunk/debian/patches/general/086_enable_ca_variants.diff 2006-01-11 21:10:20 UTC (rev 1065)
+++ trunk/debian/patches/general/086_enable_ca_variants.diff 2006-01-11 21:19:15 UTC (rev 1066)
@@ -0,0 +1,16 @@
+Remove these definitions because they take precedence over variants
+which can then not be selected. (closes: #347496)
+
+Index: xc/programs/xkbcomp/rules/xorg
+===================================================================
+--- xc/programs/xkbcomp/rules/xorg.orig
++++ xc/programs/xkbcomp/rules/xorg
+@@ -313,8 +313,6 @@
+ $pcmodels intl = us(%mcompose)
+ * intl = us(pc104compose)
+ * jp = pc/pc(pc102)+pc/jp(latin)+pc/jp:2
+- $pcmodels ca = pc/pc(%m)+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)
+- * ca = pc/pc(pc105)+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)
+ $pcmodels $nonlatin = pc/pc(%m)+pc/us+pc/%l%(v):2
+ $pcmodels * = pc/pc(%m)+pc/%l%(v)
+ * $nonlatin = pc/pc(pc105)+pc/us+pc/%l%(v):2
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-01-11 21:10:20 UTC (rev 1065)
+++ trunk/debian/patches/series 2006-01-11 21:19:15 UTC (rev 1066)
@@ -53,6 +53,7 @@
general/083_siliconmotion_rotate_option_disables_randr.diff -p0
general/084_xkb_implement_grp:sclk_toggle.diff -p0
general/085_sessreg_implement_hostname_hashing.diff -p0
+general/086_enable_ca_variants.diff -p0
general/090_xkb_fix_uk_macintosh_problems.diff -p0
general/091_xkb_implement_compose:caps.diff -p0
general/093_xkb_fix_macintosh_problems.diff -p0
Reply to: