xft: Changes to 'debian-unstable'

[Julien Cristau <jcristau@moszumanska.debian.org>]

 debian/changelog |    6 ++++++
 src/xftglyphs.c  |    6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 58ef0aac88d8d2a57a4d467e9c1edffa4d9d7887
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 18 20:14:09 2014 +0100

    Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 6aa0c0d..fef4a38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xft (2.3.1-2) unstable; urgency=medium
+
+  * Fix FTBFS with freetype 2.5.1 (closes: #733385).
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 18 Jan 2014 20:14:05 +0100
+
 xft (2.3.1-1) unstable; urgency=low
 
   * New upstream release:

commit b7b4bc1386bb0c3fdd84491f305940ad9a9ebc9d
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Dec 2 16:26:24 2013 +0100

    Use FT_*_H macros instead of including <freetype/*.h>
    
    freetype moved its headers around in 2.5.1.
    
    Signed-off-by: Julien Cristau <jcristau@debian.org>
    (cherry picked from commit 4acfdaf95adb0a05c2a25550bdde036c865902f4)

diff --git a/src/xftglyphs.c b/src/xftglyphs.c
index 2f3dc5a..4b5fb82 100644
--- a/src/xftglyphs.c
+++ b/src/xftglyphs.c
@@ -21,10 +21,10 @@
  */
 
 #include "xftint.h"
-#include <freetype/ftoutln.h>
-#include <freetype/ftlcdfil.h>
+#include FT_OUTLINE_H
+#include FT_LCD_FILTER_H
 
-#include <freetype/ftsynth.h>
+#include FT_SYNTHESIS_H
 
 /*
  * Validate the memory info for a font