diff -u t1utils-1.34/debian/changelog t1utils-1.34/debian/changelog --- t1utils-1.34/debian/changelog +++ t1utils-1.34/debian/changelog @@ -1,3 +1,10 @@ +t1utils (1.34-1ubuntu1) karmic; urgency=low + + * t1asm.c: rename getline() function to avoid name conflict with the + one defined in stdio.h, fixes FTBFS (LP: #453828). + + -- Ilya Barygin Sat, 17 Oct 2009 14:25:14 +0400 + t1utils (1.34-1) unstable; urgency=low * New upstream release. diff -u t1utils-1.34/debian/control t1utils-1.34/debian/control --- t1utils-1.34/debian/control +++ t1utils-1.34/debian/control @@ -2,7 +2,8 @@ Section: text Priority: optional Homepage: http://www.lcdf.org/type/ -Maintainer: C.M. Connelly +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: C.M. Connelly Build-Depends: debhelper Standards-Version: 3.8.1 only in patch2: unchanged: --- t1utils-1.34.orig/t1asm.c +++ t1utils-1.34/t1asm.c @@ -280,7 +280,7 @@ the newline is put into line[]. When terminated by '{', the '{' is not put into line[], and the flag start_charstring is set to 1. */ -static void getline() +static void getline_t1utils() { int c; char *p = line; @@ -721,7 +721,7 @@ without /Subrs sections and provided a patch. */ while (!feof(ifp) && !ferror(ifp)) { - getline(); + getline_t1utils(); if (!ever_active) { if (strncmp(line, "currentfile eexec", 17) == 0 && isspace(line[17])) { @@ -792,7 +792,7 @@ /* There may be additional code. */ while (!feof(ifp) && !ferror(ifp)) { - getline(); + getline_t1utils(); eexec_string(line); }