X Strike Force X.Org X11 SVN commit: r272 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-06-26 12:54:43 -0500 (Sun, 26 Jun 2005)
New Revision: 272
Added:
trunk/debian/patches/013a_xkb_symbols_euro_support.diff
Modified:
trunk/debian/TODO
trunk/debian/patches/019_iso8859-15_Compose_fix.diff
Log:
- Patch audit. This chunk thanks to Eugene Kovev. Thank you!
- 012_Xaw_StripChart_fix.diff -- already present
- 014_startx_hostname_fix.diff -- already present
- 015_vesa_ifdef_afb_calls.diff -- already present and ported
- 016_ICE_subprotocol_reply_fix.diff -- already present
- 017_fix_Xlib_depend_target.diff -- already present and ported
- 018_xtt_1.4.1.diff -- missing, but not needed anymore as X-TrueType now
is not shipped.
- 020_conditionalize_xie_headers.diff -- missing, but no longer needed,
as xie headers are no longer shipped
- 021_riscpc_ioport_fix.diff -- already present
- 022_ati_r128_support_800_byte_pitch.diff -- upstream
- 023_specs_doc_fixes.diff -- already present and ported
- 025_fix_dri_resume.diff -- missing, but affected files (radeon kernel
driver) are not shipped anymore
- 013_xkb_symbols_euro_support.diff -- missing. Rediffed patch added as
013a. NOTE: I have not tested this against patch-audit yet.
- 019_iso8859-15_Compose_fix.diff -- already present and ported, but xorg
version has "acute" and xfree86 has "apostrophe". Patch changed to xfree86
variant
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-06-25 22:08:04 UTC (rev 271)
+++ trunk/debian/TODO 2005-06-26 17:54:43 UTC (rev 272)
@@ -51,20 +51,7 @@
deliberately removed. I need to know. :-)
011_SECURITY_makedepend_safer.diff
011a_recognize_glibc_2.3.2_locale_names.diff
-012_Xaw_StripChart_fix.diff
-013_xkb_symbols_euro_support.diff
-014_startx_hostname_fix.diff
-015_vesa_ifdef_afb_calls.diff
-016_ICE_subprotocol_reply_fix.diff
-017_fix_Xlib_depend_target.diff
-018_xtt_1.4.1.diff
-019_iso8859-15_Compose_fix.diff
-020_conditionalize_xie_headers.diff
-021_riscpc_ioport_fix.diff
-022_ati_r128_support_800_byte_pitch.diff
-023_specs_doc_fixes.diff
024_ati_r128_and_radeon_enable_build_without_vgahw.diff
-025_fix_dri_resume.diff
026_xc_programs_manpage_overhaul.diff
027_ati_driver_message_cleanups.diff
028_fbdev_depth24_support.diff
Added: trunk/debian/patches/013a_xkb_symbols_euro_support.diff
===================================================================
--- trunk/debian/patches/013a_xkb_symbols_euro_support.diff 2005-06-25 22:08:04 UTC (rev 271)
+++ trunk/debian/patches/013a_xkb_symbols_euro_support.diff 2005-06-26 17:54:43 UTC (rev 272)
@@ -0,0 +1,72 @@
+$Id: 013_xkb_symbols_euro_support.diff 1535 2004-06-15 17:03:25Z branden $
+
+This patch by Mike A. Harris.
+
+Not submitted upstream yet.
+
+Index: xc/programs/xkbcomp/symbols/hu
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/hu 2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/hu 2005-06-26 12:12:46.000000000 +0800
+@@ -246,6 +246,8 @@
+ [ backslash ] };
+ key <AD02> { [ w, W ],
+ [ bar ] };
++ key <AD07> { [ u, U ],
++ [ EuroSign ] };
+ key <AD08> { [ i, I ],
+ [ Iacute ] };
+ key <AD12> { [ uacute, Uacute ],
+Index: xc/programs/xkbcomp/symbols/hu_US
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/hu_US 2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/hu_US 2005-06-26 12:12:46.000000000 +0800
+@@ -44,6 +44,8 @@
+ key <AD02> { [ w, W ],
+ [ bar ] };
+ key <AD06> { [ z, Z ] };
++ key <AD07> { [ u, U ],
++ [ EuroSign ] };
+ key <AD08> { [ i, I ],
+ [ Iacute ] };
+ // key <AD11> { [ odoubleacute, Odoubleacute ],
+Index: xc/programs/xkbcomp/symbols/pl
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/pl 2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/pl 2005-06-26 12:12:46.000000000 +0800
+@@ -25,6 +25,8 @@
+ [ lstroke, Lstroke ] };
+ key <AB06> { [ ],
+ [ nacute, Nacute ] };
++ key <AD07> { [ ],
++ [ EuroSign ] };
+ key <AD09> { [ ],
+ [ oacute, Oacute ] };
+ key <AC02> { [ ],
+Index: xc/programs/xkbcomp/symbols/pl2
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/pl2 2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/pl2 2005-06-26 12:12:46.000000000 +0800
+@@ -45,7 +45,8 @@
+ key <AD04> { [ r, R ] };
+ key <AD05> { [ t, T ] };
+ key <AD06> { [ z, Z ] };
+- key <AD07> { [ u, U ] };
++ key <AD07> { [ u, U ],
++ [ EuroSign ] };
+ key <AD08> { [ i, I ] };
+ key <AD09> { [ o, O ] };
+ key <AD10> { [ p, P ] };
+Index: xc/programs/xkbcomp/symbols/tr
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/tr 2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/tr 2005-06-26 12:12:46.000000000 +0800
+@@ -37,6 +37,8 @@
+ key <AE11> { [ asterisk, question ],
+ [ backslash ] };
+ key <AE12> { [ minus, underscore ] };
++ key <AD03> { [ e, E ],
++ [ EuroSign ] };
+ key <AD08> { [ idotless, I ] };
+ key <AD11> { [ gbreve, Gbreve ] };
+ key <AD12> { [ udiaeresis, Udiaeresis ],
Modified: trunk/debian/patches/019_iso8859-15_Compose_fix.diff
===================================================================
--- trunk/debian/patches/019_iso8859-15_Compose_fix.diff 2005-06-25 22:08:04 UTC (rev 271)
+++ trunk/debian/patches/019_iso8859-15_Compose_fix.diff 2005-06-26 17:54:43 UTC (rev 272)
@@ -1,6 +1,6 @@
$Id$
-This patch by Wolfgang Sourdeau and R� Kuhlmann.
+This patch by Wolfgang Sourdeau and Rüdiger Kuhlmann.
Account for lack of spacing diaeresis key and codepoint.
@@ -15,7 +15,7 @@
<Multi_key> <x> <x> : "\327" multiply
-<Multi_key> <apostrophe> <apostrophe> : "\264" acute
-<Multi_key> <comma> <comma> : "\270" cedilla
-+<Multi_key> <apostrophe> <apostrophe> : "'" acute
++<Multi_key> <apostrophe> <apostrophe> : "'" apostrophe
<Multi_key> <quotedbl> <quotedbl> : "\"" quotedbl
XCOMM Accented Alphabet
<Multi_key> <A> <grave> : "\300" Agrave
Reply to: