tags 733405 + pending thanks Dear maintainer,
I've prepared an NMU for lasi (versioned as 1.1.0-1.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards. diff -Nru lasi-1.1.0/debian/changelog lasi-1.1.0/debian/changelog --- lasi-1.1.0/debian/changelog 2014-06-19 14:01:01.000000000 +0200 +++ lasi-1.1.0/debian/changelog 2014-06-19 13:49:25.000000000 +0200 @@ -1,3 +1,12 @@ +lasi (1.1.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use 3.0 (quilt) format + * debian/patches/fix-freetype-ftbfs (Closes: #733405): + - Include Freetype headers in recommended way, fix FTBFS + + -- Angel Abad <an...@debian.org> Thu, 19 Jun 2014 13:36:38 +0200 + lasi (1.1.0-1) unstable; urgency=low [ Andrew Ross ] diff -Nru lasi-1.1.0/debian/patches/fix-freetype-ftbfs lasi-1.1.0/debian/patches/fix-freetype-ftbfs --- lasi-1.1.0/debian/patches/fix-freetype-ftbfs 1970-01-01 01:00:00.000000000 +0100 +++ lasi-1.1.0/debian/patches/fix-freetype-ftbfs 2014-06-19 13:45:54.000000000 +0200 @@ -0,0 +1,99 @@ +Description: Include Freetype headers in recommended way. + This change should fix <https://sourceforge.net/p/lasi/bugs/2/>. The + change goes a bit beyond the macports patch for the problem linked in + that bug report which was incomplete. (I searched for all occurrences + of #include and freetype in the code base and changed to the standard + form.) + . + Tested on Linux with Freetype version 2.4.9 which implies this change + does not disrupt anything for that Freetype version. A further test + for Freetype version 2.5.1 (which previously could not be used with + libLASi because of the non-standard #includes in the old version + of that code) has been requested. +Author: Alan W. Irwin +Origin: http://sourceforge.net/p/lasi/code/182/ +Bug: http://sourceforge.net/p/lasi/bugs/2/ +Bug-Debian: http://bugs.debian.org/733405 +Reviewed-By: Juhani Numminen <juhaninummin...@gmail.com> + +--- lasi-1.1.0.orig/include/LASi.h ++++ lasi-1.1.0/include/LASi.h +@@ -11,7 +11,8 @@ + #include <sstream> + #include <map> + #include <pango/pango.h> +-#include <freetype/ftglyph.h> ++#include <ft2build.h> ++#include FT_GLYPH_H + + class FreetypeGlyphMgr; + class ContextMgr; +--- lasi-1.1.0.orig/src/drawGlyph.cpp ++++ lasi-1.1.0/src/drawGlyph.cpp +@@ -6,7 +6,8 @@ + */ + + #include <ostream> +-#include <freetype/ftoutln.h> ++#include <ft2build.h> ++#include FT_OUTLINE_H + #include <algorithm> + #include <LASi.h> + #include <config.h> +--- lasi-1.1.0.orig/src/drawGlyph.h ++++ lasi-1.1.0/src/drawGlyph.h +@@ -10,7 +10,8 @@ + + #include <iostream> + #include <pango/pango.h> +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + + /** Generate the Postscript commands to draw the glyph + * using the font in pPangoCtx. +--- lasi-1.1.0.orig/src/glyphMgr.cpp ++++ lasi-1.1.0/src/glyphMgr.cpp +@@ -10,8 +10,7 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H +- +-#include <freetype/ftglyph.h> ++#include FT_GLYPH_H + + #include <cassert> + #include "util.h" +--- lasi-1.1.0.orig/src/glyphMgr.h ++++ lasi-1.1.0/src/glyphMgr.h +@@ -15,8 +15,7 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H +- +-#include <freetype/ftglyph.h> ++#include FT_GLYPH_H + + /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly. + */ +--- lasi-1.1.0.orig/src/util.cpp ++++ lasi-1.1.0/src/util.cpp +@@ -11,7 +11,6 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H +-//#include <freetype/freetype.h> + + using namespace std; + +--- lasi-1.1.0.orig/src/util.h ++++ lasi-1.1.0/src/util.h +@@ -18,7 +18,7 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H +-#include <freetype/ftglyph.h> ++#include FT_GLYPH_H + + std::ostream& operator<<(std::ostream&, const FT_Library); + std::ostream& operator<<(std::ostream&, const FT_Face); diff -Nru lasi-1.1.0/debian/patches/series lasi-1.1.0/debian/patches/series --- lasi-1.1.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ lasi-1.1.0/debian/patches/series 2014-06-19 13:47:21.000000000 +0200 @@ -0,0 +1 @@ +fix-freetype-ftbfs diff -Nru lasi-1.1.0/debian/source/format lasi-1.1.0/debian/source/format --- lasi-1.1.0/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ lasi-1.1.0/debian/source/format 2014-06-19 13:37:41.000000000 +0200 @@ -0,0 +1 @@ +3.0 (quilt) -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
