From e486e338d31fe65b6107af004806dc100b0831ca Mon Sep 17 00:00:00 2001
From: Giacomo Catenazzi <cate@debian.org>
Date: Tue, 18 Sep 2007 21:25:32 +0200
Subject: [PATCH] Import Debian changes 1.2.0.svn250-2

libg15render (1.2.0.svn250-2) unstable; urgency=low

  * And correct the libg15render.h, not requiring -I includes
---
 debian/changelog   |  6 ++++++
 src/libg15render.h | 10 ++--------
 src/screen.c       |  7 +++++++
 src/text.c         |  4 ++++
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1af7e45..bb49255 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libg15render (1.2.0.svn250-2) unstable; urgency=low
+  
+  * And correct the libg15render.h, not requiring -I includes
+
+ -- Giacomo Catenazzi <cate@debian.org>  Tue, 18 Sep 2007 21:25:32 +0200
+
 libg15render (1.2.0.svn250-1) unstable; urgency=low
 
   * New upstream (from svn) 
diff --git a/src/libg15render.h b/src/libg15render.h
index 19a1581..37df3f8 100644
--- a/src/libg15render.h
+++ b/src/libg15render.h
@@ -10,12 +10,6 @@ extern "C"
 
 #define TTF_SUPPORT 1
 
-#ifdef TTF_SUPPORT
-#include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/ftbitmap.h>
-#endif
-
 #define BYTE_SIZE 		8
 #define G15_BUFFER_LEN  	1048
 #define G15_LCD_OFFSET  	32
@@ -42,8 +36,8 @@ extern "C"
 /** g15canvas::mode_reverse determines whether color values passed to g15r_setPixel are reversed.*/
     int mode_reverse;
 #ifdef TTF_SUPPORT
-    FT_Library ftLib;
-    FT_Face ttf_face[G15_MAX_FACE][sizeof (FT_Face)];
+    struct FT_LibraryRec_  * ftLib;
+    struct FT_FaceRec_* ttf_face[G15_MAX_FACE][sizeof (struct FT_FaceRec_*)];
     int ttf_fontsize[G15_MAX_FACE];
 #endif
   } g15canvas;
diff --git a/src/screen.c b/src/screen.c
index 2e592be..9ec972d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -16,8 +16,15 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include <stdio.h>
+#include <ft2build.h>
+#include <freetype/freetype.h>
+#include <freetype/ftbitmap.h>
+
 #include "libg15render.h"
 
+
+
 /**
  * Retrieves the value of the pixel at (x, y)
  * 
diff --git a/src/text.c b/src/text.c
index c83b07f..1611187 100644
--- a/src/text.c
+++ b/src/text.c
@@ -16,6 +16,10 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include <ft2build.h>
+#include <freetype/freetype.h>
+#include <freetype/ftbitmap.h>
+
 #include "libg15render.h"
 
 void