Josh Triplett wrote: > The attached patch updates my previous workaround for the ttf-freefont > spacing issue, which is currently affecting the graphical > debian-installer. For the benefit of the bug report, here's the patch I forgot to attach. - Josh Triplett
diff -Naur ttf-freefont-20060126.orig/debian/changelog ttf-freefont-20060126/debian/changelog --- ttf-freefont-20060126.orig/debian/changelog 2006-03-12 16:54:25.000000000 -0800 +++ ttf-freefont-20060126/debian/changelog 2006-03-12 18:50:13.000000000 -0800 @@ -1,3 +1,13 @@ +ttf-freefont (20060126-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Re-enable spacing bug workaround, and update ascent/descent in patch. + This fixes spacing issues in several applications, hopefully including + the graphical debian-installer. However, OpenOffice.org still shows + spacing issues, so this doesn't quite fix #254113. + + -- Josh Triplett <josh@freedesktop.org> Sun, 12 Mar 2006 18:49:57 -0800 + ttf-freefont (20060126-1) unstable; urgency=low * Add self to Uploaders to be sure that someone officially "takes care" diff -Naur ttf-freefont-20060126.orig/debian/fontforge-bug-workaround.patch ttf-freefont-20060126/debian/fontforge-bug-workaround.patch --- ttf-freefont-20060126.orig/debian/fontforge-bug-workaround.patch 2006-03-12 16:54:25.000000000 -0800 +++ ttf-freefont-20060126/debian/fontforge-bug-workaround.patch 2006-03-12 17:07:21.000000000 -0800 @@ -1,12 +1,12 @@ -diff -Nru sfd.ori/FreeMonoBoldOblique.sfd sfd/FreeMonoBoldOblique.sfd ---- sfd.ori/FreeMonoBoldOblique.sfd 2006-01-23 16:33:44.000000000 +0100 -+++ sfd/FreeMonoBoldOblique.sfd 2006-02-15 23:32:07.908882199 +0100 +diff -Naur sfd.orig/FreeMono.sfd sfd/FreeMono.sfd +--- sfd.orig/FreeMono.sfd 2006-01-09 01:40:34.000000000 -0800 ++++ sfd/FreeMono.sfd 2006-03-12 17:06:52.000000000 -0800 @@ -10,6 +10,8 @@ UnderlineWidth: 50 Ascent: 800 Descent: 200 -+HheadAscent: -311 -+HheadDescent: 78 ++HheadAscent: -273 ++HheadDescent: 119 NeedsXUIDChange: 1 FSType: 0 PfmFamily: 49 @@ -20,15 +20,15 @@ HheadDOffset: 1 OS2Vendor: 'PfEd' ScriptLang: 2 -diff -Nru sfd.ori/FreeMonoBold.sfd sfd/FreeMonoBold.sfd ---- sfd.ori/FreeMonoBold.sfd 2006-01-09 10:40:35.000000000 +0100 -+++ sfd/FreeMonoBold.sfd 2006-02-15 23:32:07.972869614 +0100 +diff -Naur sfd.orig/FreeMonoBold.sfd sfd/FreeMonoBold.sfd +--- sfd.orig/FreeMonoBold.sfd 2006-01-09 01:40:35.000000000 -0800 ++++ sfd/FreeMonoBold.sfd 2006-03-12 17:06:43.000000000 -0800 @@ -10,6 +10,8 @@ UnderlineWidth: 50 Ascent: 800 Descent: 200 +HheadAscent: -355 -+HheadDescent: 165 ++HheadDescent: 166 NeedsXUIDChange: 1 FSType: 0 PfmFamily: 49 @@ -42,15 +42,15 @@ HheadDOffset: 1 OS2Vendor: 'PfEd' ScriptLang: 2 -diff -Nru sfd.ori/FreeMonoOblique.sfd sfd/FreeMonoOblique.sfd ---- sfd.ori/FreeMonoOblique.sfd 2006-01-09 10:40:35.000000000 +0100 -+++ sfd/FreeMonoOblique.sfd 2006-02-15 23:32:08.056853097 +0100 +diff -Naur sfd.orig/FreeMonoBoldOblique.sfd sfd/FreeMonoBoldOblique.sfd +--- sfd.orig/FreeMonoBoldOblique.sfd 2006-01-23 07:33:44.000000000 -0800 ++++ sfd/FreeMonoBoldOblique.sfd 2006-03-12 17:06:35.000000000 -0800 @@ -10,6 +10,8 @@ UnderlineWidth: 50 Ascent: 800 Descent: 200 -+HheadAscent: -200 -+HheadDescent: 73 ++HheadAscent: -311 ++HheadDescent: 166 NeedsXUIDChange: 1 FSType: 0 PfmFamily: 49 @@ -63,16 +63,16 @@ -HheadDescent: 0 HheadDOffset: 1 OS2Vendor: 'PfEd' - ScriptLang: 4 -diff -Nru sfd.ori/FreeMono.sfd sfd/FreeMono.sfd ---- sfd.ori/FreeMono.sfd 2006-01-09 10:40:34.000000000 +0100 -+++ sfd/FreeMono.sfd 2006-02-15 23:32:08.163832056 +0100 + ScriptLang: 2 +diff -Naur sfd.orig/FreeMonoOblique.sfd sfd/FreeMonoOblique.sfd +--- sfd.orig/FreeMonoOblique.sfd 2006-01-09 01:40:35.000000000 -0800 ++++ sfd/FreeMonoOblique.sfd 2006-03-12 17:06:26.000000000 -0800 @@ -10,6 +10,8 @@ UnderlineWidth: 50 Ascent: 800 Descent: 200 -+HheadAscent: -257 -+HheadDescent: 119 ++HheadAscent: -277 ++HheadDescent: 146 NeedsXUIDChange: 1 FSType: 0 PfmFamily: 49 @@ -85,16 +85,16 @@ -HheadDescent: 0 HheadDOffset: 1 OS2Vendor: 'PfEd' - ScriptLang: 2 -diff -Nru sfd.ori/FreeSansBoldOblique.sfd sfd/FreeSansBoldOblique.sfd ---- sfd.ori/FreeSansBoldOblique.sfd 2006-01-09 10:40:37.000000000 +0100 -+++ sfd/FreeSansBoldOblique.sfd 2006-02-15 23:32:08.288807476 +0100 + ScriptLang: 4 +diff -Naur sfd.orig/FreeSans.sfd sfd/FreeSans.sfd +--- sfd.orig/FreeSans.sfd 2006-01-26 06:26:57.000000000 -0800 ++++ sfd/FreeSans.sfd 2006-03-12 17:06:08.000000000 -0800 @@ -10,6 +10,8 @@ - UnderlineWidth: 69 + UnderlineWidth: 50 Ascent: 800 Descent: 200 -+HheadAscent: -179 -+HheadDescent: 109 ++HheadAscent: -430 ++HheadDescent: 262 NeedsXUIDChange: 1 FSType: 0 PfmFamily: 33 @@ -107,16 +107,16 @@ -HheadDescent: 0 HheadDOffset: 1 OS2Vendor: 'PfEd' - ScriptLang: 3 -diff -Nru sfd.ori/FreeSansBold.sfd sfd/FreeSansBold.sfd ---- sfd.ori/FreeSansBold.sfd 2006-01-27 09:37:04.000000000 +0100 -+++ sfd/FreeSansBold.sfd 2006-02-15 23:32:08.344796464 +0100 + ScriptLang: 10 +diff -Naur sfd.orig/FreeSansBold.sfd sfd/FreeSansBold.sfd +--- sfd.orig/FreeSansBold.sfd 2006-01-27 00:37:04.000000000 -0800 ++++ sfd/FreeSansBold.sfd 2006-03-12 17:05:29.000000000 -0800 @@ -10,6 +10,8 @@ UnderlineWidth: 69 Ascent: 800 Descent: 200 -+HheadAscent: -359 -+HheadDescent: 155 ++HheadAscent: -367 ++HheadDescent: 260 NeedsXUIDChange: 1 FSType: 0 PfmFamily: 33 @@ -130,15 +130,15 @@ HheadDOffset: 1 OS2Vendor: 'PfEd' ScriptLang: 7 -diff -Nru sfd.ori/FreeSansOblique.sfd sfd/FreeSansOblique.sfd ---- sfd.ori/FreeSansOblique.sfd 2006-01-24 13:01:39.000000000 +0100 -+++ sfd/FreeSansOblique.sfd 2006-02-15 23:32:08.429779750 +0100 +diff -Naur sfd.orig/FreeSansBoldOblique.sfd sfd/FreeSansBoldOblique.sfd +--- sfd.orig/FreeSansBoldOblique.sfd 2006-01-09 01:40:37.000000000 -0800 ++++ sfd/FreeSansBoldOblique.sfd 2006-03-12 17:05:15.000000000 -0800 @@ -10,6 +10,8 @@ - UnderlineWidth: 50 + UnderlineWidth: 69 Ascent: 800 Descent: 200 -+HheadAscent: -341 -+HheadDescent: 219 ++HheadAscent: -363 ++HheadDescent: 109 NeedsXUIDChange: 1 FSType: 0 PfmFamily: 33 @@ -151,16 +151,16 @@ -HheadDescent: 0 HheadDOffset: 1 OS2Vendor: 'PfEd' - ScriptLang: 6 -diff -Nru sfd.ori/FreeSans.sfd sfd/FreeSans.sfd ---- sfd.ori/FreeSans.sfd 2006-01-26 15:26:57.000000000 +0100 -+++ sfd/FreeSans.sfd 2006-02-15 23:32:08.574751237 +0100 + ScriptLang: 3 +diff -Naur sfd.orig/FreeSansOblique.sfd sfd/FreeSansOblique.sfd +--- sfd.orig/FreeSansOblique.sfd 2006-01-24 04:01:39.000000000 -0800 ++++ sfd/FreeSansOblique.sfd 2006-03-12 17:04:58.000000000 -0800 @@ -10,6 +10,8 @@ UnderlineWidth: 50 Ascent: 800 Descent: 200 +HheadAscent: -341 -+HheadDescent: 259 ++HheadDescent: 231 NeedsXUIDChange: 1 FSType: 0 PfmFamily: 33 @@ -173,16 +173,16 @@ -HheadDescent: 0 HheadDOffset: 1 OS2Vendor: 'PfEd' - ScriptLang: 10 -diff -Nru sfd.ori/FreeSerifBoldItalic.sfd sfd/FreeSerifBoldItalic.sfd ---- sfd.ori/FreeSerifBoldItalic.sfd 2006-01-17 14:26:05.000000000 +0100 -+++ sfd/FreeSerifBoldItalic.sfd 2006-02-15 23:32:08.771712499 +0100 + ScriptLang: 6 +diff -Naur sfd.orig/FreeSerif.sfd sfd/FreeSerif.sfd +--- sfd.orig/FreeSerif.sfd 2006-02-14 03:08:35.000000000 -0800 ++++ sfd/FreeSerif.sfd 2006-03-12 17:03:58.000000000 -0800 @@ -10,6 +10,8 @@ UnderlineWidth: 50 Ascent: 800 Descent: 200 -+HheadAscent: -371 -+HheadDescent: 288 ++HheadAscent: -366 ++HheadDescent: 345 NeedsXUIDChange: 1 FSType: 0 PfmFamily: 17 @@ -194,11 +194,11 @@ HheadAOffset: 1 -HheadDescent: 0 HheadDOffset: 1 - OS2Vendor: 'PfEd' - ScriptLang: 3 -diff -Nru sfd.ori/FreeSerifBold.sfd sfd/FreeSerifBold.sfd ---- sfd.ori/FreeSerifBold.sfd 2006-01-23 15:44:18.000000000 +0100 -+++ sfd/FreeSerifBold.sfd 2006-02-15 23:32:08.857695588 +0100 + OS2SubXSize: 0 + OS2SubYSize: 1 +diff -Naur sfd.orig/FreeSerifBold.sfd sfd/FreeSerifBold.sfd +--- sfd.orig/FreeSerifBold.sfd 2006-01-23 06:44:18.000000000 -0800 ++++ sfd/FreeSerifBold.sfd 2006-03-12 17:02:13.000000000 -0800 @@ -10,6 +10,8 @@ UnderlineWidth: 50 Ascent: 800 @@ -218,15 +218,15 @@ HheadDOffset: 1 OS2Vendor: 'PfEd' ScriptLang: 4 -diff -Nru sfd.ori/FreeSerifItalic.sfd sfd/FreeSerifItalic.sfd ---- sfd.ori/FreeSerifItalic.sfd 2006-01-09 10:45:18.000000000 +0100 -+++ sfd/FreeSerifItalic.sfd 2006-02-15 23:32:08.983670811 +0100 +diff -Naur sfd.orig/FreeSerifBoldItalic.sfd sfd/FreeSerifBoldItalic.sfd +--- sfd.orig/FreeSerifBoldItalic.sfd 2006-01-17 05:26:05.000000000 -0800 ++++ sfd/FreeSerifBoldItalic.sfd 2006-03-12 17:02:13.000000000 -0800 @@ -10,6 +10,8 @@ UnderlineWidth: 50 Ascent: 800 Descent: 200 -+HheadAscent: -322 -+HheadDescent: 238 ++HheadAscent: -371 ++HheadDescent: 288 NeedsXUIDChange: 1 FSType: 0 PfmFamily: 17 @@ -240,15 +240,15 @@ HheadDOffset: 1 OS2Vendor: 'PfEd' ScriptLang: 3 -diff -Nru sfd.ori/FreeSerif.sfd sfd/FreeSerif.sfd ---- sfd.ori/FreeSerif.sfd 2006-02-14 12:08:35.000000000 +0100 -+++ sfd/FreeSerif.sfd 2006-02-15 23:32:09.220624207 +0100 +diff -Naur sfd.orig/FreeSerifItalic.sfd sfd/FreeSerifItalic.sfd +--- sfd.orig/FreeSerifItalic.sfd 2006-01-09 01:45:18.000000000 -0800 ++++ sfd/FreeSerifItalic.sfd 2006-03-12 17:02:13.000000000 -0800 @@ -10,6 +10,8 @@ UnderlineWidth: 50 Ascent: 800 Descent: 200 -+HheadAscent: -366 -+HheadDescent: 246 ++HheadAscent: -322 ++HheadDescent: 238 NeedsXUIDChange: 1 FSType: 0 PfmFamily: 17 @@ -260,5 +260,5 @@ HheadAOffset: 1 -HheadDescent: 0 HheadDOffset: 1 - OS2SubXSize: 0 - OS2SubYSize: 1 + OS2Vendor: 'PfEd' + ScriptLang: 3 diff -Naur ttf-freefont-20060126.orig/debian/rules ttf-freefont-20060126/debian/rules --- ttf-freefont-20060126.orig/debian/rules 2006-03-12 16:54:25.000000000 -0800 +++ ttf-freefont-20060126/debian/rules 2006-03-12 17:07:31.000000000 -0800 @@ -26,7 +26,7 @@ dh_testdir tar xzvf freefont-sfd.tar.gz - # cd sfd && patch -p1 < ../debian/fontforge-bug-workaround.patch + cd sfd && patch -p1 < ../debian/fontforge-bug-workaround.patch chmod u+x ./convertfonts.sh ./convertfonts.sh # Strip the fonts for the udeb
Attachment:
signature.asc
Description: OpenPGP digital signature