Hi, I've prepared a different patch than the one suggested by Steve. Instead of putting the content of freetype.h into each file, I have renamed freetype.h to dvi2ps_freetype.h.
I'm attaching the full diff of the package I have prepared, I'll be uploading to the 3-day delayed queue. -- Regards, Marga
diff -Nru dvi2ps-5.1j/debian/changelog dvi2ps-5.1j/debian/changelog --- dvi2ps-5.1j/debian/changelog 2012-04-30 13:34:57.000000000 +0200 +++ dvi2ps-5.1j/debian/changelog 2014-04-25 19:34:48.000000000 +0200 @@ -1,3 +1,11 @@ +dvi2ps (5.1j-1.1) unstable; urgency=medium + + * Non-maintainer upload to fix FTBFS. + * Add 09_freetype_header.patch, renaming freetype.h to dvi2ps_freetype.h + to avoid collision with Freetype (Closes: #733394) + + -- Margarita Manterola <ma...@debian.org> Fri, 25 Apr 2014 19:32:54 +0200 + dvi2ps (5.1j-1) unstable; urgency=low * New upstream release diff -Nru dvi2ps-5.1j/debian/patches/09_freetype_header.patch dvi2ps-5.1j/debian/patches/09_freetype_header.patch --- dvi2ps-5.1j/debian/patches/09_freetype_header.patch 1970-01-01 01:00:00.000000000 +0100 +++ dvi2ps-5.1j/debian/patches/09_freetype_header.patch 2014-04-25 19:36:49.000000000 +0200 @@ -0,0 +1,79 @@ +Index: dvi2ps-5.1j/Makefile.am +=================================================================== +--- dvi2ps-5.1j.orig/Makefile.am 2014-04-25 19:31:38.899954306 +0200 ++++ dvi2ps-5.1j/Makefile.am 2014-04-25 19:32:13.836828101 +0200 +@@ -6,7 +6,7 @@ + conf.h dvi2ps-conf.h \ + defs.h gdefs.h xxstdio.h global.h commands.h set.h dconv.h \ + virfont.h pkfont.h gffont.h rastfont.h \ +- bifont.h freetype.h funcfont.h \ ++ bifont.h dvi2ps_freetype.h funcfont.h \ + jsub.h emit.h \ + ps.h \ + ptexmac.h dvips.h cscommands.h \ +Index: dvi2ps-5.1j/Makefile.in +=================================================================== +--- dvi2ps-5.1j.orig/Makefile.in 2014-04-25 19:31:47.468169129 +0200 ++++ dvi2ps-5.1j/Makefile.in 2014-04-25 19:32:04.680599641 +0200 +@@ -222,7 +222,7 @@ + conf.h dvi2ps-conf.h \ + defs.h gdefs.h xxstdio.h global.h commands.h set.h dconv.h \ + virfont.h pkfont.h gffont.h rastfont.h \ +- bifont.h freetype.h funcfont.h \ ++ bifont.h dvi2ps_freetype.h funcfont.h \ + jsub.h emit.h \ + ps.h \ + ptexmac.h dvips.h cscommands.h \ +Index: dvi2ps-5.1j/freetype.h +=================================================================== +--- dvi2ps-5.1j.orig/freetype.h 2006-04-15 18:28:31.000000000 +0200 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,2 +0,0 @@ +-#include <ft2build.h> +-#include FT_FREETYPE_H +Index: dvi2ps-5.1j/pstt.c +=================================================================== +--- dvi2ps-5.1j.orig/pstt.c 2010-10-12 10:57:20.000000000 +0200 ++++ dvi2ps-5.1j/pstt.c 2014-04-25 19:29:46.949112858 +0200 +@@ -12,7 +12,7 @@ + #include "rastfont.h" + #include "ps.h" + #ifdef FREETYPE +-#include "freetype.h" ++#include "dvi2ps_freetype.h" + #endif /* FREETYPE */ + + static struct psbiops po; +Index: dvi2ps-5.1j/pstt2t1.c +=================================================================== +--- dvi2ps-5.1j.orig/pstt2t1.c 2010-09-30 10:17:56.000000000 +0200 ++++ dvi2ps-5.1j/pstt2t1.c 2014-04-25 19:30:11.037730037 +0200 +@@ -33,7 +33,7 @@ + #include "defs.h" + #include "emit.h" + #include "global.h" +-#include "freetype.h" ++#include "dvi2ps_freetype.h" + #include "cscommands.h" + + /* +Index: dvi2ps-5.1j/ttfont.c +=================================================================== +--- dvi2ps-5.1j.orig/ttfont.c 2014-04-25 19:29:07.468184190 +0200 ++++ dvi2ps-5.1j/ttfont.c 2014-04-25 19:29:57.709388966 +0200 +@@ -12,7 +12,7 @@ + + #ifdef FREETYPE + +-#include "freetype.h" ++#include "dvi2ps_freetype.h" + #include FT_TRUETYPE_IDS_H + + #if FREETYPE_MAJOR==2 +Index: dvi2ps-5.1j/dvi2ps_freetype.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ dvi2ps-5.1j/dvi2ps_freetype.h 2006-04-15 18:28:31.000000000 +0200 +@@ -0,0 +1,2 @@ ++#include <ft2build.h> ++#include FT_FREETYPE_H diff -Nru dvi2ps-5.1j/debian/patches/series dvi2ps-5.1j/debian/patches/series --- dvi2ps-5.1j/debian/patches/series 2012-04-30 11:49:23.000000000 +0200 +++ dvi2ps-5.1j/debian/patches/series 2014-04-25 19:28:00.000000000 +0200 @@ -3,3 +3,4 @@ 05_debian-patch.patch 07_vflib3.patch 08_kpse_set_program_name.patch +09_freetype_header.patch
