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

@@ -0,0 +1,36 @@
+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) 
+
+ -- Giacomo Catenazzi <cate@debian.org>  Tue, 18 Sep 2007 20:51:36 +0200
+
+libg15render (1.2-4) unstable; urgency=low
+
+  * Don't use ' include "config" ' in usr/include header
+
+ -- Giacomo Catenazzi <cate@debian.org>  Sun, 16 Sep 2007 14:37:33 +0200
+
+libg15render (1.2-3) unstable; urgency=low
+
+  * Add FreeType2 support
+
+ -- Giacomo Catenazzi <cate@debian.org>  Sun, 16 Sep 2007 12:19:52 +0200
+
+libg15render (1.2-2) unstable; urgency=low
+
+  * Correct building dependencies (closes: #441923)
+
+ -- Giacomo Catenazzi <cate@debian.org>  Thu, 13 Sep 2007 22:32:40 +0200
+
+libg15render (1.2-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Giacomo Catenazzi <cate@debian.org>  Tue, 28 Aug 2007 19:09:53 +0200
+

debian/compat

@@ -0,0 +1 @@
+5

debian/control

@@ -0,0 +1,30 @@
+Source: libg15render
+Section: libs
+Priority: optional
+Maintainer: Giacomo Catenazzi <cate@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtool, automake1.9,
+ libg15-dev, libusb-dev, libfreetype6-dev
+Standards-Version: 3.7.2
+
+Package: libg15render1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description:  Library for interfacing with the Logitech G15 keyboards
+ libg15 provides an API for low level control of the LCD display and
+ the extra keys on some Logitech keyboards (G11, G15)
+ .
+ This package contains the shared library for graphics primitives and
+ text services for the display of the G15 keyboard.
+
+Package: libg15render-dev
+Section: libdevel
+Architecture: any
+Depends: libg15render1 (= ${binary:Version})
+Description:  Library for interfacing with the Logitech G15 keyboards
+ libg15 provides an API for low level control of the LCD display and
+ the extra keys on some Logitech keyboards (G11, G15)
+ .
+ This package contains the header files and the static library of
+ libg15render.
+

debian/copyright

@@ -0,0 +1,29 @@
+This package was debianized by Giacomo A. Catenazzi <cate@debian.org> on
+Tue, 28 Aug 2007 19:09:53 +0200.
+
+It was downloaded from http://g15tools.sourceforge.net/
+
+Upstream Authors: 
+    Philip Lawatsch <philip@lawatsch.at>
+    Alex Ibrado <alex@ibrado.org>
+    Anthony J. Mirabella <mirabeaj@gmail.com>
+    Mike Lampard <mlampard@users.sf.net>
+
+Copyright: 
+
+    Copyright (C) 2006,2007	Philip Lawatsch <philip@lawatsch.at>
+				Alex Ibrado <alex@ibrado.org>
+				Anthony J. Mirabella <mirabeaj@gmail.com>
+				Mike Lampard <mlampard@users.sf.net>
+License:
+
+    g15tools is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+License can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is (C) 2007, Giacomo A. Catenazzi <cate@debian.org> and
+is licensed under the GPL v2 (ot later), see `/usr/share/common-licenses/GPL-2'.
+

debian/dirs

@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin

debian/docs

@@ -0,0 +1,2 @@
+NEWS
+README

debian/libg15render-dev.install

@@ -0,0 +1,5 @@
+debian/tmp/usr/include/* usr/include/
+debian/tmp/usr/lib/lib*.a usr/lib/
+debian/tmp/usr/lib/lib*.so usr/lib/
+debian/tmp/usr/lib/*.la usr/lib/
+

debian/libg15render.install

@@ -0,0 +1 @@
+usr/lib/libg15*.so.*

debian/libg15render1.install

@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.* usr/lib/

debian/libg15render1.manpages

@@ -0,0 +1 @@
+libg15render.3

debian/rules

@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+
+AUTOMAKE_REMOVE := Makefile Makefile.in configure aclocal.m4
+AUTOMAKE_REMOVE += src/*.lo src/*.o src/*.la src/Makefile src/Makefile.in
+AUTOMAKE_REMOVE += config.status config.log config.h config.h.in config/* 
+AUTOMAKE_REMOVE += libtool stamp-h1 .libs src/.libs
+
+clean::
+	-rm -Rf $(AUTOMAKE_REMOVE)
+
+makebuilddir:: Makefile
+
+Makefile:: Makefile.am bootstrap
+	./bootstrap
+
+  
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-ttf

debian/watch

@@ -0,0 +1,7 @@
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+http://sf.net/g15tools libg15render-(.*)\.tar\.bz2
+

src/libg15render.h

@@ -8,15 +8,7 @@ extern "C"
 
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
+#define TTF_SUPPORT 1
-#include "config.h"
-#endif
-
-#ifdef TTF_SUPPORT
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_BITMAP_H
-#endif
 
 #define BYTE_SIZE 		8
 #define G15_BUFFER_LEN  	1048
@@ -44,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;
+    struct FT_LibraryRec_  * ftLib;
-    FT_Face ttf_face[G15_MAX_FACE][sizeof (FT_Face)];
+    struct FT_FaceRec_* ttf_face[G15_MAX_FACE][sizeof (struct FT_FaceRec_*)];
     int ttf_fontsize[G15_MAX_FACE];
 #endif
   } g15canvas;

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)
  * 

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