Merge lp:~l3on/ubuntu/trusty/drawtk/ftbfs-1277213 into lp:ubuntu/trusty/drawtk

[Leo Iannacone]

Fix FTBFS including freetype (LP: #1277213)

[Andrew Starr-Bochicchio (andrewsomething)]

Uploaded. Good work!

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-06-14 15:03:39 +0000
+++ .pc/applied-patches	2014-02-26 23:47:39 +0000
@@ -1,1 +1,2 @@
 fix-duplicated-font.patch
+fix-freetype-includes.patch

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-14 15:03:39 +0000
+++ debian/changelog	2014-02-26 23:47:39 +0000
@@ -1,3 +1,10 @@
+drawtk (2.0-2ubuntu1) trusty; urgency=medium
+
+  * Fix FTBFS including freetype (LP: #1277213):
+    - new patch fix-freetype-includes.patch
+
+ -- Leo Iannacone <[e-mail]>  Thu, 27 Feb 2014 00:39:56 +0100
+
 drawtk (2.0-2) unstable; urgency=low
 
   * Add bugfix: fix-duplicated-font.patch

=== modified file 'debian/control'
--- debian/control	2012-05-16 19:36:38 +0000
+++ debian/control	2014-02-26 23:47:39 +0000
@@ -1,7 +1,8 @@
 Source: drawtk
 Section: libs
 Priority: extra
-Maintainer: Nicolas Bourdaud <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Nicolas Bourdaud <[e-mail]>
 Build-Depends: debhelper (>= 9), dh-autoreconf,
  libsdl1.2-dev, libfreeimage-dev, libfreetype6-dev, libfontconfig-dev,
  libgl1-mesa-dev | libgl-dev, libgstreamer-plugins-base0.10-dev

=== added file 'debian/patches/fix-freetype-includes.patch'
--- debian/patches/fix-freetype-includes.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-freetype-includes.patch	2014-02-26 23:47:39 +0000
@@ -0,0 +1,26 @@
+Description: Fix build failure with freetype 2.5.1
+Author: Juhani Numminen <[e-mail]>
+Bug-Debian: http://bugs.debian.org/733365
+Bug-Ubuntu: https://launchpad.net/bugs/1277213
+
+---
+ src/fonttex.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/src/fonttex.c
++++ b/src/fonttex.c
+@@ -21,10 +21,10 @@
+ #endif
+ 
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttrigon.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TRIGONOMETRY_H
+ #include <fontconfig/fontconfig.h>
+ #include <stdint.h>
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-06-14 15:03:39 +0000
+++ debian/patches/series	2014-02-26 23:47:39 +0000
@@ -1,1 +1,2 @@
 fix-duplicated-font.patch
+fix-freetype-includes.patch

=== modified file 'src/fonttex.c'
--- src/fonttex.c	2012-06-14 15:03:39 +0000
+++ src/fonttex.c	2014-02-26 23:47:39 +0000
@@ -21,10 +21,10 @@
 #endif
 
 #include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
 #include <fontconfig/fontconfig.h>
 #include <stdint.h>