Author: branden Date: 2004-01-12 14:54:30 -0500 (Mon, 12 Jan 2004) New Revision: 896
Added: branches/4.3.0/sid/debian/patches/046_fix_cyrillic_font_aliases.diff Modified: branches/4.3.0/sid/debian/TODO Log: Restore patch #012 from trunk that was lost. Modified: branches/4.3.0/sid/debian/TODO =================================================================== --- branches/4.3.0/sid/debian/TODO 2004-01-12 19:07:13 UTC (rev 895) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 19:54:30 UTC (rev 896) @@ -58,7 +58,7 @@ 009_s3_trio64v2_dx_and_gx_support.diff unchanged renamed to 010_s3_trio64_dx_and_gx_support.diff 010_linux_apm_vetoed_suspend_fix.diff upstream 011_chinese_locale_fixups.diff upstream on xf-4_3-branch -012_fix_cyrillic_font_aliases.diff NOT PORTED will need to be renumbered +012_fix_cyrillic_font_aliases.diff merged renamed to 046_fix_cyrillic_font_aliases 013_wacom_wait_longer_for_input.diff merged renamed and expanded to 036_wacom_usb_tablet_update patch 014_document_grab_key_sequences.diff upstream 015_lbxproxy_segfault_fix.diff upstream Copied: branches/4.3.0/sid/debian/patches/046_fix_cyrillic_font_aliases.diff (from rev 895, trunk/debian/patches/012_fix_cyrillic_font_aliases.diff) =================================================================== --- trunk/debian/patches/012_fix_cyrillic_font_aliases.diff 2004-01-12 19:07:13 UTC (rev 895) +++ branches/4.3.0/sid/debian/patches/046_fix_cyrillic_font_aliases.diff 2004-01-12 19:54:30 UTC (rev 896) @@ -0,0 +1,73 @@ +$Id$ + +Prevent font alias collisions between KOI8-R encodings and the stock ones. + +This patch by Branden Robinson. + +Not submitted upstream. Not sure they'd like it. + +--- xc/fonts/bdf/cyrillic/fonts.alias.orig 2004-01-12 14:46:15.000000000 -0500 ++++ xc/fonts/bdf/cyrillic/fonts.alias 2004-01-12 14:46:23.000000000 -0500 +@@ -9,31 +9,31 @@ + ! + ! $XFree86: xc/fonts/bdf/cyrillic/fonts.alias,v 3.4 2002/12/15 01:49:06 dawes Exp $ + ! +-fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r +-variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r +-5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r +-6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r +-6x10 -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r +-6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r +-6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r +-7x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r +-7x14b -misc-fixed-bold-r-normal--14-130-75-75-c-70-koi8-r +-8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r +-8x16 -misc-fixed-medium-r-normal--16-160-75-75-c-80-koi8-r +-8x16bold -misc-fixed-bold-r-normal--16-160-75-75-c-80-koi8-r +-9x15 -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r +-9x15bold -misc-fixed-bold-r-normal--15-140-75-75-c-90-koi8-r +-9x18 -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r +-9x18bold -misc-fixed-bold-r-normal--18-120-100-100-c-90-koi8-r +-10x16bold -cronyx-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r +-10x20 -cronyx-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r +-12x24 -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r +-12x24bold -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r +-nil2 -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r ++fixed-cyrillic -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r ++variable-cyrillic -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r ++5x8-cyrillic -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r ++6x9-cyrillic -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r ++6x10-cyrillic -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r ++6x13-cyrillic -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r ++6x13bold-cyrillic -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r ++7x14-cyrillic -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r ++7x14b-cyrillic -misc-fixed-bold-r-normal--14-130-75-75-c-70-koi8-r ++8x13-cyrillic -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r ++8x16-cyrillic -misc-fixed-medium-r-normal--16-160-75-75-c-80-koi8-r ++8x16bold-cyrillic -misc-fixed-bold-r-normal--16-160-75-75-c-80-koi8-r ++9x15-cyrillic -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r ++9x15bold-cyrillic -misc-fixed-bold-r-normal--15-140-75-75-c-90-koi8-r ++9x18-cyrillic -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r ++9x18bold-cyrillic -misc-fixed-bold-r-normal--18-120-100-100-c-90-koi8-r ++10x16bold-cyrillic -cronyx-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r ++10x20-cyrillic -cronyx-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r ++12x24-cyrillic -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r ++12x24bold-cyrillic -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r ++nil2-cyrillic -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r + koi-fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r + koi-variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r +-koi5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r +-koi6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r ++koi5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r ++koi6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r + koi6x10 -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r + koi6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r + koi6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r +@@ -51,5 +51,5 @@ + koi12x24 -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r + koi12x24bold -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r + koinil2 -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r +-screen8x16 -screen-fixed-medium-r-normal--16-120-100-100-c-80-koi8-r +-screen8x16b -screen-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r ++screen8x16-cyrillic -screen-fixed-medium-r-normal--16-120-100-100-c-80-koi8-r ++screen8x16b-cyrillic -screen-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r Property changes on: branches/4.3.0/sid/debian/patches/046_fix_cyrillic_font_aliases.diff ___________________________________________________________________ Name: svn:keywords + Id
