[SCM] graphlcd-base packaging repository branch, master, updated. debian/0.1.5-5-6-g5f6495b
etobi
git at e-tobi.net
Wed May 9 17:55:24 UTC 2012
The following commit has been merged in the master branch:
commit 16f9235ee3696894d827ae61004639ab63e46f2b
Author: etobi <git at e-tobi.net>
Date: Wed May 9 19:34:50 2012 +0200
Merging changes from the yaVDR team - thx guys!
diff --git a/debian/changelog b/debian/changelog
index 4dc3d50..0d060cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,98 @@
+graphlcd-base (0.1.9+git20120310-1) oneiric; urgency=low
+
+ * Merging changes from the yaVDR team - thx guys!
+ * Standards-Version: 3.9.3
+
+ -- Tobias Grimm <etobi at debian.org> Wed, 09 May 2012 19:32:40 +0200
+
+graphlcd-base (0.1.9+git20120310-0yavdr1~oneiric) oneiric; urgency=medium
+
+ * Enable IMAGEMAGICK-support again?
+
+ -- Reiner Paulus <flex0r at gmx.net> Sat, 10 Mar 2012 10:52:58 +0100
+
+graphlcd-base (0.1.9+git20120310-0yavdr0~oneiric) oneiric; urgency=medium
+
+ * New Upstream Snaphot
+
+ -- Reiner Paulus <flex0r at gmx.net> Sat, 10 Mar 2012 10:18:58 +0100
+
+graphlcd-base (0.1.9+git20120306-0yavdr0~oneiric) oneiric; urgency=medium
+
+ * New Upstream Snaphot
+
+ -- Reiner Paulus <flex0r at gmx.net> Tue, 06 Mar 2012 16:02:43 +0100
+
+graphlcd-base (0.1.9+git20120125-0yavdr0~oneiric1) oneiric; urgency=medium
+
+ * Added libmagick++-dev build-dep and enabled IMAGEMAGICK-support
+
+ -- Alexander Grothe <alexandergrothe at gmx.net> Sun, 19 Feb 2012 13:43:15 +0100
+
+graphlcd-base (0.1.9+git20120125-0yavdr0~oneiric) oneiric; urgency=medium
+
+ * New Upstream Snaphot
+
+ -- Reiner Paulus <flex0r at gmx.net> Wed, 25 Jan 2012 20:09:29 +0100
+
+graphlcd-base (0.1.9+git20111129-0yavdr0~oneiric) oneiric; urgency=medium
+
+ * New Upstream Snaphot
+
+ -- Reiner Paulus <flex0r at gmx.net> Tue, 29 Nov 2011 09:12:00 +0100
+
+graphlcd-base (0.1.9+git20111024-0yavdr0~oneiric) oneiric; urgency=medium
+
+ * New Upstream Snaphot
+ * added libmagick-dev build-dep
+
+ -- Holger Schvestka <hotzenplotz5 at gmx.de> Mon, 24 Oct 2011 20:08:15 +0200
+
+graphlcd-base (0.1.9+git20110829-1yavdr1~oneiric) oneiric; urgency=medium
+
+ * New upstream snapshot (touchcol branch)
+ * removed ax206 udev file, now provided upstream
+
+ -- Gerald Dachs <gda at dachsweb.de> Mon, 29 Aug 2011 11:02:52 +0200
+
+graphlcd-base (0.1.9+git20110825-1yavdr2~oneiric) oneiric; urgency=medium
+
+ * changed group in ax206 udev rule
+
+ -- Gerald Dachs <gda at dachsweb.de> Fri, 26 Aug 2011 13:52:09 +0200
+
+graphlcd-base (0.1.9+git20110825-1yavdr1~oneiric) oneiric; urgency=medium
+
+ * New upstream snapshot (touchcol branch)
+
+ -- Gerald Dachs <gda at dachsweb.de> Thu, 25 Aug 2011 13:16:42 +0200
+
+graphlcd-base (0.1.9+git20110812-1yavdr2~oneiric) oneiric; urgency=medium
+
+ * cleaned up package (thanks to Keine_Ahnung)
+
+ -- Gerald Dachs <gda at dachsweb.de> Thu, 25 Aug 2011 11:56:18 +0200
+
+graphlcd-base (0.1.9+git20110812-1yavdr1~oneiric) oneiric; urgency=low
+
+ * New upstream snapshot (touchcol branch)
+ * added udev rule for ax206dpf
+
+ -- Gerald Dachs <gda at dachsweb.de> Fri, 12 Aug 2011 09:04:14 +0200
+
+graphlcd-base (0.1.9+git20110811-1yavdr1~oneiric) oneiric; urgency=low
+
+ * New upstream snapshot (touchcol branch)
+ * activated ax206dpf
+
+ -- Gerald Dachs <gda at dachsweb.de> Thu, 11 Aug 2011 09:38:39 +0200
+
+graphlcd-base (0.1.9+git20110424-1yavdr1~oneiric) oneiric; urgency=low
+
+ * New upstream snapshot
+
+ -- Holger Schvestka <hotzenplotz5 at gmx.de> Sun, 24 Apr 2011 07:17:02 +0200
+
graphlcd-base (0.1.5-5) unstable; urgency=low
* Added 03_gcc-43.dpatch to fix gcc 4.3.x issue
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 442d94e..461f700 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
Source: graphlcd-base
Priority: optional
Maintainer: Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>= 4.1.16), dpatch, libfreetype6-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7), libfreetype6-dev, pkg-config, libusb-dev, libmagick9-dev | libmagick-dev |libmagickwand-dev, libmagick++-dev
+Standards-Version: 3.9.3
Section: libs
Package: libglcddrivers1-dev
Provides: libglcddrivers-dev
-Conflicts: libglcddrivers-dev, libglcddrivers1 (< 0.1.5)
+Conflicts: libglcddrivers-dev, libglcddrivers1 (<< 0.1.9)
Section: libdevel
Architecture: any
Depends: libglcddrivers1 (= ${Source-Version})
@@ -29,7 +29,7 @@ Description: Library for programming graphical LC displays
Package: libglcdgraphics2-dev
Provides: libglcdgraphics-dev
-Conflicts: libglcdgraphics-dev, libglcdgraphics2 (< 0.1.5)
+Conflicts: libglcdgraphics-dev, libglcdgraphics2 (<< 0.1.9)
Section: libdevel
Architecture: any
Depends: libglcdgraphics2 (= ${Source-Version})
@@ -51,3 +51,20 @@ Depends: ${shlibs:Depends}
Description: Tools for GraphLCD VDR Plugin
Tools to convert pictures and fonts to GraphLCD format and to display
pictures and text on the LCD using the GraphLCD drivers library.
+
+Package: libglcdskin1-dev
+Section: libdevel
+Architecture: any
+Depends: libglcdskin1
+Description: Development files for the GraphLCD graphics library
+ The GraphLCD graphics library
+
+Package: libglcdskin1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Library for handling skins with GraphLCD
+ The GraphLCD graphics library provides methods for processing skins
+ to be displayed with the GraphLCD drivers library.
+
+
diff --git a/debian/graphlcd-tools.install b/debian/graphlcd-tools.install
index 8c18820..2d1ad85 100644
--- a/debian/graphlcd-tools.install
+++ b/debian/graphlcd-tools.install
@@ -3,7 +3,6 @@ tools/convpic/convall usr/bin/
tools/convpic/c_bmp2glcd usr/bin/
tools/convpic/c_tif2glcd usr/bin/
tools/crtfont/crtfont usr/bin/
-tools/genfont/genfont usr/bin/
tools/showpic/showpic usr/bin/
tools/showtext/showtext usr/bin/
tools/lcdtestpattern/lcdtestpattern usr/bin/
diff --git a/debian/libglcddrivers1.install b/debian/libglcddrivers1.install
index 68b37e5..c0f5bbb 100644
--- a/debian/libglcddrivers1.install
+++ b/debian/libglcddrivers1.install
@@ -1,3 +1,4 @@
debian/tmp/usr/lib/libglcddrivers.so.*
graphlcd.conf etc/
+99-graphlcd-base.rules lib/udev/rules.d
diff --git a/debian/libglcdskin1-dev.install b/debian/libglcdskin1-dev.install
new file mode 100644
index 0000000..b030599
--- /dev/null
+++ b/debian/libglcdskin1-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/glcdskin
+debian/tmp/usr/lib/libglcdskin.so
+
+
diff --git a/debian/libglcdskin1.install b/debian/libglcdskin1.install
new file mode 100644
index 0000000..7994c4a
--- /dev/null
+++ b/debian/libglcdskin1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libglcdskin.so.*
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f092f92..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_libserdisp
-02_utf8
-03_gcc-43
diff --git a/debian/patches/01_libserdisp.dpatch b/debian/patches/01_libserdisp.dpatch
deleted file mode 100644
index 5317dc3..0000000
--- a/debian/patches/01_libserdisp.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_libserdisp.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Load libserdisp.so.1 instead of libserdisp.so
-
- at DPATCH@
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/serdisp.c graphlcd-base-0.1.5/glcddrivers/serdisp.c
---- graphlcd-base-0.1.5~/glcddrivers/serdisp.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/serdisp.c 2008-03-26 03:03:46.000000000 +0100
-@@ -58,14 +58,14 @@
-
- // dynamically load serdisplib using dlopen() & co.
-
-- sdhnd = dlopen("libserdisp.so", RTLD_LAZY);
-+ sdhnd = dlopen("libserdisp.so.1", RTLD_LAZY);
- if (!sdhnd) { // try /usr/local/lib
-- sdhnd = dlopen("/usr/local/lib/libserdisp.so", RTLD_LAZY);
-+ sdhnd = dlopen("/usr/local/lib/libserdisp.so.1", RTLD_LAZY);
- }
-
- if (!sdhnd) { // serdisplib seems not to be installed
- syslog(LOG_ERR, "%s: error: unable to dynamically load library '%s'. Err: %s (cDriver::Init)\n",
-- config->name.c_str(), "libserdisp.so", "not found");
-+ config->name.c_str(), "libserdisp.so.1", "not found");
- return -1;
- }
-
diff --git a/debian/patches/02_utf8.dpatch b/debian/patches/02_utf8.dpatch
deleted file mode 100644
index 18a3bb9..0000000
--- a/debian/patches/02_utf8.dpatch
+++ /dev/null
@@ -1,735 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_utf8.dpatch by trantor @ vdrportal.de
-## http://www.vdr-portal.de/board/thread.php?threadid=65363
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds utf8 compatibility
-
- at DPATCH@
-diff -Nru -x.svn graphlcd-base-0.1.5/glcdgraphics/bitmap.c graphlcd-base-0.1.5-utf8/glcdgraphics/bitmap.c
---- graphlcd-base-0.1.5/glcdgraphics/bitmap.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5-utf8/glcdgraphics/bitmap.c 2007-06-10 20:53:12.000000000 +0200
-@@ -16,6 +16,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
-+#include <syslog.h>
-
- #include "bitmap.h"
- #include "common.h"
-@@ -506,7 +507,11 @@
- int xt;
- int yt;
- int i;
-- char c;
-+ int c;
-+ int c0;
-+ int c1;
-+ int c2;
-+ int c3;
- int start;
-
- clip(x, 0, width - 1);
-@@ -547,6 +552,28 @@
- for (i = start; i < (int) text.length(); i++)
- {
- c = text[i];
-+ c0 = text[i];
-+ c1 = text[i+1];
-+ c2 = text[i+2];
-+ c3 = text[i+3];
-+ c0 &=0xff; c1 &=0xff; c2 &=0xff; c3 &=0xff;
-+
-+ if( c0 >= 0xc2 && c0 <= 0xdf && c1 >= 0x80 && c1 <= 0xbf ){ //2 byte UTF-8 sequence found
-+ i+=1;
-+ c = ((c0&0x1f)<<6) | (c1&0x3f);
-+ }else if( (c0 == 0xE0 && c1 >= 0xA0 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf)
-+ || (c0 >= 0xE1 && c1 <= 0xEC && c1 >= 0x80 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf)
-+ || (c0 == 0xED && c1 >= 0x80 && c1 <= 0x9f && c2 >= 0x80 && c2 <= 0xbf)
-+ || (c0 >= 0xEE && c0 <= 0xEF && c1 >= 0x80 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf) ){ //3 byte UTF-8 sequence found
-+ c = ((c0&0x0f)<<4) | ((c1&0x3f)<<6) | (c2&0x3f);
-+ i+=2;
-+ }else if( (c0 == 0xF0 && c1 >= 0x90 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf && c3 >= 0x80 && c3 <= 0xbf)
-+ || (c0 >= 0xF1 && c0 >= 0xF3 && c1 >= 0x80 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf && c3 >= 0x80 && c3 <= 0xbf)
-+ || (c0 == 0xF4 && c1 >= 0x80 && c1 <= 0x8f && c2 >= 0x80 && c2 <= 0xbf && c3 >= 0x80 && c3 <= 0xbf) ){ //4 byte UTF-8 sequence found
-+ c = ((c0&0x07)<<2) | ((c1&0x3f)<<4) | ((c2&0x3f)<<6) | (c3&0x3f);
-+ i+=3;
-+ }
-+
- if (xt > xmax)
- {
- i = text.length();
-@@ -589,7 +616,7 @@
- return xt;
- }
-
--int cBitmap::DrawCharacter(int x, int y, int xmax, char c, const cFont * font,
-+int cBitmap::DrawCharacter(int x, int y, int xmax, int c, const cFont * font,
- eColor color, int skipPixels)
- {
- const cBitmap * charBitmap;
-@@ -804,4 +831,53 @@
- }
- }
-
-+#ifdef HAVE_FREETYPE2
-+
-+cBitmapFt2::cBitmapFt2(int width, int height, int ch, unsigned char * data)
-+: cBitmap(width, height, data)
-+{
-+ charcode = ch;
-+}
-+
-+cBitmapFt2::~cBitmapFt2()
-+{
-+}
-+
-+int cBitmapFt2::GetCharcode( void ) const
-+{
-+ return charcode;
-+}
-+
-+cBitmapCache::cBitmapCache()
-+{
-+ start = NULL;
-+ next = NULL;
-+ last = NULL;
-+}
-+
-+cBitmapCache::cBitmapCache( void *ptr)
-+{
-+ start = NULL;
-+ next = NULL;
-+ last = NULL;
-+ pointer = ptr;
-+}
-+
-+cBitmapCache::~cBitmapCache()
-+{
-+}
-+
-+bool cBitmapCache::PushBack(void *ptr)
-+{
-+ cBitmapCache *newptr = new cBitmapCache(ptr);
-+ if( start == NULL ){ start = newptr; last = newptr; }
-+ else{
-+ last->next = newptr;
-+ last=newptr;
-+ }
-+ return true;
-+}
-+
-+#endif
-+
- } // end of namespace
-diff -Nru -x.svn graphlcd-base-0.1.5/glcdgraphics/bitmap.h graphlcd-base-0.1.5-utf8/glcdgraphics/bitmap.h
---- graphlcd-base-0.1.5/glcdgraphics/bitmap.h 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5-utf8/glcdgraphics/bitmap.h 2007-06-10 20:53:12.000000000 +0200
-@@ -60,7 +60,7 @@
- void DrawBitmap(int x, int y, const cBitmap & bitmap, eColor color);
- int DrawText(int x, int y, int xmax, const std::string & text, const cFont * font,
- eColor color = clrBlack, bool proportional = true, int skipPixels = 0);
-- int DrawCharacter(int x, int y, int xmax, char c, const cFont * font,
-+ int DrawCharacter(int x, int y, int xmax, int c, const cFont * font,
- eColor color = clrBlack, int skipPixels = 0);
-
- cBitmap * SubBitmap(int x1, int y1, int x2, int y2) const;
-@@ -70,6 +70,38 @@
- void SavePBM(const std::string & fileName);
- };
-
-+#ifdef HAVE_FREETYPE2
-+class cBitmapFt2: public cBitmap
-+{
-+private:
-+protected:
-+ int charcode;
-+public:
-+ //cBitmapFt2(void):cBitmap(1,1) {charcode=0;};
-+ cBitmapFt2(int width, int height, int ch, unsigned char * data = NULL);
-+ ~cBitmapFt2();
-+ int GetCharcode( void ) const;
-+
-+};
-+
-+class cBitmapCache
-+{
-+private:
-+protected:
-+public:
-+ cBitmapCache *start; // start bitmap
-+ cBitmapCache *next; // next bitmap
-+ cBitmapCache *last; // last bitmap
-+ void *pointer;
-+
-+ cBitmapCache();
-+ cBitmapCache( void * );
-+ ~cBitmapCache();
-+
-+ bool PushBack( void * );
-+};
-+#endif
-+
- } // end of namespace
-
- #endif
-diff -Nru -x.svn graphlcd-base-0.1.5/glcdgraphics/font.c graphlcd-base-0.1.5-utf8/glcdgraphics/font.c
---- graphlcd-base-0.1.5/glcdgraphics/font.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5-utf8/glcdgraphics/font.c 2007-06-10 20:53:12.000000000 +0200
-@@ -69,6 +69,7 @@
- {
- // cleanup if we already had a loaded font
- Unload();
-+ SetFontType(1); //original fonts
-
- FILE * fontFile;
- int i;
-@@ -185,6 +186,7 @@
- {
- // cleanup if we already had a loaded font
- Unload();
-+ SetFontType(2); // ft2 fonts
- #ifdef HAVE_FREETYPE2
- if (access(fileName.c_str(), F_OK) != 0)
- {
-@@ -192,9 +194,6 @@
- return false;
- }
- // file exists
-- FT_Library library;
-- FT_Face face;
-- FT_GlyphSlot slot;
-
- int error = FT_Init_FreeType(&library);
- if (error)
-@@ -223,168 +222,79 @@
- return false;
- }
-
-- // set slot
-- slot = face->glyph;
--
- // set Size
- FT_Set_Char_Size(face, 0, size * 64, 0, 0);
-
-- wchar_t utf_buff[256];
-- if (dingBats)
-- {
--/*
-- FT_CharMap charmap = 0;
-- for (int n = 0; n < face->num_charmaps; n++)
-- {
-- if (face->charmaps[n]->platform_id == 3 &&
-- face->charmaps[n]->encoding_id == 0)
-- {
-- charmap = face->charmaps[n];
-- //break;
-- }
-- }
-- if (charmap)
-- syslog(LOG_ERR, "cFont::LoadFT2: platform_id: %d, encoding_id: %d", charmap->platform_id, charmap->encoding_id);
-- error = FT_Set_Charmap(_face, charmap);
-- if (error)
-- {
-- syslog(LOG_ERR, "cFont::LoadFT2: FT_Select_Charmap encoding not supported: %d", charmap->encoding_id);
-- }
--*/
-- }
-- else
-- {
-- iconv_t cd;
-- if ((cd = iconv_open("WCHAR_T", encoding.c_str())) == (iconv_t) -1)
-- {
-- syslog(LOG_ERR, "cFont::LoadFT2: Iconv encoding not supported: %s", encoding.c_str());
-- error = FT_Done_Face(face);
-- syslog(LOG_ERR, "cFont::LoadFT2: FT_Done_Face(..) returned (%d)", error);
-- error = FT_Done_FreeType(library);
-- syslog(LOG_ERR, "cFont::LoadFT2: FT_Done_FreeType(..) returned (%d)", error);
-- return false;
-- }
-- for (int c = 0; c < 256; c++)
-- {
-- char char_buff = c;
-- wchar_t wchar_buff;
-- char * in_buff,* out_buff;
-- size_t in_len, out_len, count;
--
-- in_len = 1;
-- out_len = 4;
-- in_buff = (char *) &char_buff;
-- out_buff = (char *) &wchar_buff;
-- count = iconv(cd, &in_buff, &in_len, &out_buff, &out_len);
-- if ((size_t) -1 == count)
-- {
-- utf_buff[c] = 0;
-- }
-- utf_buff[c] = wchar_buff;
-- }
-- iconv_close(cd);
-- }
--
- // get some global parameters
-- totalHeight = (face->size->metrics.ascender >> 6) - (face->size->metrics.descender >> 6);
-- totalWidth = face->size->metrics.max_advance >> 6;
-- totalAscent = face->size->metrics.ascender >> 6;
-- lineHeight = face->size->metrics.height >> 6;
-- spaceBetween = 0;
--#if 0
-- syslog(LOG_DEBUG, "cFont::LoadFT2: totalHeight = %d", totalHeight);
-- syslog(LOG_DEBUG, "cFont::LoadFT2: totalWidth = %d", totalWidth);
-- syslog(LOG_DEBUG, "cFont::LoadFT2: totalAscent = %d", totalAscent);
-- syslog(LOG_DEBUG, "cFont::LoadFT2: lineHeight = %d", lineHeight);
-- syslog(LOG_DEBUG, "cFont::LoadFT2: spaceBetween = %d", spaceBetween);
--#endif
-- // render glyphs for ASCII codes 0 to 255 in our bitmap class
-- FT_UInt glyph_index;
-- int num_char;
--
-- for (num_char = 0; num_char < 256; num_char++)
-- {
-- if (dingBats)
-- {
-- //Get FT char index & load the char
-- error = FT_Load_Char(face, num_char, FT_LOAD_DEFAULT);
-- }
-- else
-- {
-- //Get FT char index
-- glyph_index = FT_Get_Char_Index(face, utf_buff[num_char]);
-- //Load the char
-- error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
-- }
-- if (error)
-- {
-- syslog(LOG_ERR, "cFont::LoadFT2: ERROR when calling FT_Load_Glyph: %x", error);
-- }
--
-- // convert to a mono bitmap
-- error = FT_Render_Glyph(face->glyph, FT_RENDER_MODE_MONO);
-- if (error)
-- {
-- syslog(LOG_ERR, "cFont::LoadFT2: ERROR when calling FT_Render_Glyph: %x", error);
-- }
-+ SetTotalHeight( (face->size->metrics.ascender >> 6) - (face->size->metrics.descender >> 6) );
-+ SetTotalWidth ( face->size->metrics.max_advance >> 6 );
-+ SetTotalAscent( face->size->metrics.ascender >> 6 );
-+ SetLineHeight ( face->size->metrics.height >> 6 );
-+ SetSpaceBetween( 0 );
-
-- // now, fill our pixel data
-- cBitmap * charBitmap = new cBitmap(face->glyph->advance.x >> 6, totalHeight);
-- charBitmap->Clear();
-- unsigned char * bufPtr = face->glyph->bitmap.buffer;
-- unsigned char pixel;
-- for (int y = 0; y < face->glyph->bitmap.rows; y++)
-- {
-- for (int x = 0; x < face->glyph->bitmap.width; x++)
-- {
-- pixel = (bufPtr[x / 8] >> (7 - x % 8)) & 1;
-- if (pixel)
-- charBitmap->DrawPixel((face->glyph->metrics.horiBearingX >> 6) + x,
-- (face->size->metrics.ascender >> 6) - (face->glyph->metrics.horiBearingY >> 6) + y,
-- GLCD::clrBlack);
-- }
-- bufPtr += face->glyph->bitmap.pitch;
-- }
-- SetCharacter((char) num_char, charBitmap);
-- }
-- error = FT_Done_Face(face);
-- if (error)
-- {
-- syslog(LOG_ERR, "cFont::LoadFT2: FT_Done_Face(..) returned (%d)", error);
-- }
-- error = FT_Done_FreeType(library);
-- if (error)
-- {
-- syslog(LOG_ERR, "cFont::LoadFT2: FT_Done_FreeType(..) returned (%d)", error);
-- }
-+ characters_cache=new cBitmapCache();
- return true;
-+
- #else
- syslog(LOG_ERR, "cFont::LoadFT2: glcdgraphics was compiled without FreeType2 support!!!");
- return false;
- #endif
- }
-
--int cFont::Width(char ch) const
-+int cFont::Width(int ch) const
- {
-- if (characters[(unsigned char) ch])
-- return characters[(unsigned char) ch]->Width();
-- else
-- return 0;
-+#ifdef HAVE_FREETYPE2
-+ if ( FontType() == 2){
-+ cBitmapFt2 *cmybitmap=GetGlyph(ch);
-+ if (cmybitmap)
-+ return cmybitmap->Width();
-+ else
-+ return 0;
-+ }else{
-+#endif
-+ if (characters[(unsigned char) ch])
-+ return characters[(unsigned char) ch]->Width();
-+ else
-+ return 0;
-+#ifdef HAVE_FREETYPE2
-+ }
-+#endif
- }
-
- int cFont::Width(const std::string & str) const
- {
- unsigned int i;
-- int sum = 0;
-+ int sum = 0;
-+ int c,c0,c1,c2,c3,symcount=0;
-
- for (i = 0; i < str.length(); i++)
- {
-- sum += Width(str[i]);
-- }
-- if (str.length() > 1)
-- {
-- sum += spaceBetween * (str.length() - 1);
-+ c = str[i];
-+ c0 = str[i];
-+ c1 = str[i+1];
-+ c2 = str[i+2];
-+ c3 = str[i+3];
-+ c0 &=0xff; c1 &=0xff; c2 &=0xff; c3 &=0xff;
-+
-+ if( c0 >= 0xc2 && c0 <= 0xdf && c1 >= 0x80 && c1 <= 0xbf ){ //2 byte UTF-8 sequence found
-+ i+=1;
-+ c = ((c0&0x1f)<<6) | (c1&0x3f);
-+ }else if( (c0 == 0xE0 && c1 >= 0xA0 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf)
-+ || (c0 >= 0xE1 && c1 <= 0xEC && c1 >= 0x80 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf)
-+ || (c0 == 0xED && c1 >= 0x80 && c1 <= 0x9f && c2 >= 0x80 && c2 <= 0xbf)
-+ || (c0 >= 0xEE && c0 <= 0xEF && c1 >= 0x80 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf) ){ //3 byte UTF-8 sequence found
-+ c = ((c0&0x0f)<<4) | ((c1&0x3f)<<6) | (c2&0x3f);
-+ i+=2;
-+ }else if( (c0 == 0xF0 && c1 >= 0x90 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf && c3 >= 0x80 && c3 <= 0xbf)
-+ || (c0 >= 0xF1 && c0 >= 0xF3 && c1 >= 0x80 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf && c3 >= 0x80 && c3 <= 0xbf)
-+ || (c0 == 0xF4 && c1 >= 0x80 && c1 <= 0x8f && c2 >= 0x80 && c2 <= 0xbf && c3 >= 0x80 && c3 <= 0xbf) ){ //4 byte UTF-8 sequence found
-+ c = ((c0&0x07)<<2) | ((c1&0x3f)<<4) | ((c2&0x3f)<<6) | (c3&0x3f);
-+ i+=3;
-+ }
-+ symcount++;
-+ sum += Width(c);
- }
-+ sum += spaceBetween * (symcount - 1);
- return sum;
- }
-
-@@ -393,23 +303,58 @@
- unsigned int i;
- int sum = 0;
-
-- for (i = 0; i < str.length() && i < len; i++)
-- {
-- sum += Width(str[i]);
-- }
-- if (std::min(str.length(), (size_t) len) > 1)
-+ int c,c0,c1,c2,c3,symcount=0;
-+
-+ for (i = 0; i < str.length() && symcount < len; i++)
- {
-- sum += spaceBetween * (std::min(str.length(), (size_t) len) - 1);
-+ c = str[i];
-+ c0 = str[i];
-+ c1 = str[i+1];
-+ c2 = str[i+2];
-+ c3 = str[i+3];
-+ c0 &=0xff; c1 &=0xff; c2 &=0xff; c3 &=0xff;
-+
-+ if( c0 >= 0xc2 && c0 <= 0xdf && c1 >= 0x80 && c1 <= 0xbf ){ //2 byte UTF-8 sequence found
-+ i+=1;
-+ c = ((c0&0x1f)<<6) | (c1&0x3f);
-+ }else if( (c0 == 0xE0 && c1 >= 0xA0 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf)
-+ || (c0 >= 0xE1 && c1 <= 0xEC && c1 >= 0x80 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf)
-+ || (c0 == 0xED && c1 >= 0x80 && c1 <= 0x9f && c2 >= 0x80 && c2 <= 0xbf)
-+ || (c0 >= 0xEE && c0 <= 0xEF && c1 >= 0x80 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf) ){ //3 byte UTF-8 sequence found
-+ c = ((c0&0x0f)<<4) | ((c1&0x3f)<<6) | (c2&0x3f);
-+ i+=2;
-+ }else if( (c0 == 0xF0 && c1 >= 0x90 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf && c3 >= 0x80 && c3 <= 0xbf)
-+ || (c0 >= 0xF1 && c0 >= 0xF3 && c1 >= 0x80 && c1 <= 0xbf && c2 >= 0x80 && c2 <= 0xbf && c3 >= 0x80 && c3 <= 0xbf)
-+ || (c0 == 0xF4 && c1 >= 0x80 && c1 <= 0x8f && c2 >= 0x80 && c2 <= 0xbf && c3 >= 0x80 && c3 <= 0xbf) ){ //4 byte UTF-8 sequence found
-+ c = ((c0&0x07)<<2) | ((c1&0x3f)<<4) | ((c2&0x3f)<<6) | (c3&0x3f);
-+ i+=3;
-+ }
-+ symcount++;
-+ sum += Width(c);
- }
-+ sum += spaceBetween * (symcount - 1);
-+
- return sum;
- }
-
--int cFont::Height(char ch) const
-+int cFont::Height(int ch) const
- {
-- if (characters[(unsigned char) ch])
-- return characters[(unsigned char) ch]->Height();
-- else
-- return 0;
-+#ifdef HAVE_FREETYPE2
-+ if ( FontType() == 2){
-+ cBitmapFt2 *cmybitmap=GetGlyph(ch);
-+ if (cmybitmap)
-+ return cmybitmap->Height();
-+ else
-+ return 0;
-+ }else{
-+#endif
-+ if (characters[(unsigned char) ch])
-+ return characters[(unsigned char) ch]->Height();
-+ else
-+ return 0;
-+#ifdef HAVE_FREETYPE2
-+ }
-+#endif
- }
-
- int cFont::Height(const std::string & str) const
-@@ -432,11 +377,83 @@
- return sum;
- }
-
--const cBitmap * cFont::GetCharacter(char ch) const
-+const cBitmap * cFont::GetCharacter(int ch) const
- {
-+#ifdef HAVE_FREETYPE2
-+ if ( FontType() == 2){
-+ return GetGlyph(ch);
-+ }else{
-+#endif
- return characters[(unsigned char) ch];
-+#ifdef HAVE_FREETYPE2
-+ }
-+#endif
- }
-
-+#ifdef HAVE_FREETYPE2
-+cBitmapFt2* cFont::GetGlyph(int c) const
-+{
-+ //lookup in cache
-+ cBitmapCache *ptr = characters_cache->start;
-+ while(ptr != NULL){
-+ int charcode = ((cBitmapFt2 *)(ptr->pointer))->GetCharcode();
-+ if(c == charcode){
-+ return ((cBitmapFt2 *)(ptr->pointer));
-+ }
-+ ptr = ptr->next;
-+ }
-+
-+ FT_UInt glyph_index;
-+ //Get FT char index
-+ glyph_index = FT_Get_Char_Index(face, c);
-+
-+ //Load the char
-+ int error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
-+ if (error)
-+ {
-+ syslog(LOG_ERR, "cFont::LoadFT2: ERROR when calling FT_Load_Glyph: %x", error);
-+ }
-+
-+ FT_Render_Mode rmode = FT_RENDER_MODE_MONO;
-+#if ( (FREETYPE_MAJOR == 2 && FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 7) || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR == 2 && FREETYPE_PATCH <= 1) )
-+ if(c == 32) rmode = FT_RENDER_MODE_NORMAL;
-+#endif
-+
-+ // convert to a mono bitmap
-+ error = FT_Render_Glyph(face->glyph, rmode);
-+ if (error)
-+ {
-+ syslog(LOG_ERR, "cFont::LoadFT2: ERROR when calling FT_Render_Glyph: %x", error);
-+ }else{
-+ // now, fill our pixel data
-+ cBitmapFt2 *charBitmap = new cBitmapFt2(face->glyph->advance.x >> 6, TotalHeight(), c);
-+ charBitmap->Clear();
-+ unsigned char * bufPtr = face->glyph->bitmap.buffer;
-+ unsigned char pixel;
-+ for (int y = 0; y < face->glyph->bitmap.rows; y++)
-+ {
-+ for (int x = 0; x < face->glyph->bitmap.width; x++)
-+ {
-+ pixel = (bufPtr[x / 8] >> (7 - x % 8)) & 1;
-+ if (pixel)
-+ charBitmap->DrawPixel((face->glyph->metrics.horiBearingX >> 6) + x,
-+ (face->size->metrics.ascender >> 6) - (face->glyph->metrics.horiBearingY >> 6) + y,
-+ GLCD::clrBlack);
-+ }
-+ bufPtr += face->glyph->bitmap.pitch;
-+ }
-+
-+ // adjust maxwidth if necessary
-+ //if (totalWidth < charBitmap->Width())
-+ // totalWidth = charBitmap->Width();
-+
-+ characters_cache->PushBack(charBitmap);
-+ return charBitmap;
-+ }
-+ return NULL;
-+}
-+#endif
-+
- void cFont::SetCharacter(char ch, cBitmap * bitmapChar)
- {
- // adjust maxwidth if necessary
-@@ -578,4 +595,5 @@
- *ActualWidth = textWidth;
- }
-
-+
- } // end of namespace
-diff -Nru -x.svn graphlcd-base-0.1.5/glcdgraphics/font.h graphlcd-base-0.1.5-utf8/glcdgraphics/font.h
---- graphlcd-base-0.1.5/glcdgraphics/font.h 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5-utf8/glcdgraphics/font.h 2007-06-10 20:53:12.000000000 +0200
-@@ -18,6 +18,12 @@
- #include <string>
- #include <vector>
-
-+#ifdef HAVE_FREETYPE2
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include <iconv.h>
-+#endif
-+
- #include "bitmap.h"
-
- namespace GLCD
-@@ -33,9 +39,20 @@
- int lineHeight;
-
- cBitmap * characters[256];
-+#ifdef HAVE_FREETYPE2
-+ int fontType; //original or FT2 font, 1-original, 2-ft2
-+
-+ cBitmapCache *characters_cache;
-+ FT_Library library;
-+ FT_Face face;
-+ FT_GlyphSlot slot;
-+#endif
- protected:
- void Init();
- void Unload();
-+#ifdef HAVE_FREETYPE2
-+ cBitmapFt2* GetGlyph(int c) const;
-+#endif
- public:
- cFont();
- ~cFont();
-@@ -50,20 +67,25 @@
- int SpaceBetween() const { return spaceBetween; };
- int LineHeight() const { return lineHeight; };
-
-+#ifdef HAVE_FREETYPE2
-+ int FontType() const { return fontType; };
-+ void SetFontType(int type) { fontType = type; };
-+#endif
-+
- void SetTotalWidth(int width) { totalWidth = width; };
- void SetTotalHeight(int height) { totalHeight = height; };
- void SetTotalAscent(int ascent) { totalAscent = ascent; };
- void SetSpaceBetween(int width) { spaceBetween = width; };
- void SetLineHeight(int height) { lineHeight = height; };
-
-- int Width(char ch) const;
-+ int Width(int ch) const;
- int Width(const std::string & str) const;
- int Width(const std::string & str, unsigned int len) const;
-- int Height(char ch) const;
-+ int Height(int ch) const;
- int Height(const std::string & str) const;
- int Height(const std::string & str, unsigned int len) const;
-
-- const cBitmap * GetCharacter(char ch) const;
-+ const cBitmap * GetCharacter(int ch) const;
- void SetCharacter(char ch, cBitmap * bitmapChar);
-
- void WrapText(int Width, int Height, std::string & Text,
-diff -Nru -x.svn graphlcd-base-0.1.5/tools/crtfont/Makefile graphlcd-base-0.1.5-utf8/tools/crtfont/Makefile
---- graphlcd-base-0.1.5/tools/crtfont/Makefile 2007-02-25 18:41:30.000000000 +0100
-+++ graphlcd-base-0.1.5-utf8/tools/crtfont/Makefile 2007-06-10 20:53:09.000000000 +0200
-@@ -28,6 +28,17 @@
-
- -include $(DEPFILE)
-
-+ifdef HAVE_FREETYPE2
-+ ifneq ($(shell which freetype-config),)
-+ INCLUDES += $(shell freetype-config --cflags)
-+ LIBS += $(shell freetype-config --libs)
-+ else
-+ INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
-+ LIBS += -lfreetype
-+ endif
-+ DEFINES += -DHAVE_FREETYPE2
-+endif### Targets:
-+
- # The main program:
-
- $(PRGNAME): $(OBJS)
-diff -Nru -x.svn graphlcd-base-0.1.5/tools/lcdtestpattern/Makefile graphlcd-base-0.1.5-utf8/tools/lcdtestpattern/Makefile
---- graphlcd-base-0.1.5/tools/lcdtestpattern/Makefile 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5-utf8/tools/lcdtestpattern/Makefile 2007-06-10 20:53:09.000000000 +0200
-@@ -29,6 +29,17 @@
-
- -include $(DEPFILE)
-
-+ifdef HAVE_FREETYPE2
-+ ifneq ($(shell which freetype-config),)
-+ INCLUDES += $(shell freetype-config --cflags)
-+ LIBS += $(shell freetype-config --libs)
-+ else
-+ INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
-+ LIBS += -lfreetype
-+ endif
-+ DEFINES += -DHAVE_FREETYPE2
-+endif### Targets:
-+
- # The main program:
-
- $(PRGNAME): $(OBJS)
-diff -Nru -x.svn graphlcd-base-0.1.5/tools/showpic/Makefile graphlcd-base-0.1.5-utf8/tools/showpic/Makefile
---- graphlcd-base-0.1.5/tools/showpic/Makefile 2007-02-25 18:41:30.000000000 +0100
-+++ graphlcd-base-0.1.5-utf8/tools/showpic/Makefile 2007-06-10 20:53:10.000000000 +0200
-@@ -29,6 +29,17 @@
-
- -include $(DEPFILE)
-
-+ifdef HAVE_FREETYPE2
-+ ifneq ($(shell which freetype-config),)
-+ INCLUDES += $(shell freetype-config --cflags)
-+ LIBS += $(shell freetype-config --libs)
-+ else
-+ INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
-+ LIBS += -lfreetype
-+ endif
-+ DEFINES += -DHAVE_FREETYPE2
-+endif### Targets:
-+
- # The main program:
-
- $(PRGNAME): $(OBJS)
-diff -Nru -x.svn graphlcd-base-0.1.5/tools/showtext/Makefile graphlcd-base-0.1.5-utf8/tools/showtext/Makefile
---- graphlcd-base-0.1.5/tools/showtext/Makefile 2007-02-25 18:41:30.000000000 +0100
-+++ graphlcd-base-0.1.5-utf8/tools/showtext/Makefile 2007-06-10 20:53:10.000000000 +0200
-@@ -29,6 +29,17 @@
-
- -include $(DEPFILE)
-
-+ifdef HAVE_FREETYPE2
-+ ifneq ($(shell which freetype-config),)
-+ INCLUDES += $(shell freetype-config --cflags)
-+ LIBS += $(shell freetype-config --libs)
-+ else
-+ INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
-+ LIBS += -lfreetype
-+ endif
-+ DEFINES += -DHAVE_FREETYPE2
-+endif### Targets:
-+
- # The main program:
-
- $(PRGNAME): $(OBJS)
diff --git a/debian/patches/03_gcc-43.dpatch b/debian/patches/03_gcc-43.dpatch
deleted file mode 100644
index ac57185..0000000
--- a/debian/patches/03_gcc-43.dpatch
+++ /dev/null
@@ -1,239 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_gcc-43.dpatch by Tobias Grimm <etobi at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/avrctl.c graphlcd-base-0.1.5/glcddrivers/avrctl.c
---- graphlcd-base-0.1.5~/glcddrivers/avrctl.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/avrctl.c 2008-11-12 19:41:51.000000000 +0100
-@@ -11,6 +11,7 @@
-
- #include <stdint.h>
- #include <syslog.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/config.c graphlcd-base-0.1.5/glcddrivers/config.c
---- graphlcd-base-0.1.5~/glcddrivers/config.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/config.c 2008-11-12 19:41:51.000000000 +0100
-@@ -11,6 +11,8 @@
-
- #include <syslog.h>
- #include <fstream>
-+#include <cstring>
-+#include <cstdlib>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/framebuffer.c graphlcd-base-0.1.5/glcddrivers/framebuffer.c
---- graphlcd-base-0.1.5~/glcddrivers/framebuffer.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/framebuffer.c 2008-11-12 19:41:51.000000000 +0100
-@@ -16,6 +16,8 @@
- #include <unistd.h>
- #include <sys/mman.h>
- #include <sys/ioctl.h>
-+#include <cstdlib>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/g15daemon.c graphlcd-base-0.1.5/glcddrivers/g15daemon.c
---- graphlcd-base-0.1.5~/glcddrivers/g15daemon.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/g15daemon.c 2008-11-12 19:41:51.000000000 +0100
-@@ -19,6 +19,7 @@
- #include <poll.h>
- #include <arpa/inet.h>
- #include <unistd.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/gu126x64D-K610A4.c graphlcd-base-0.1.5/glcddrivers/gu126x64D-K610A4.c
---- graphlcd-base-0.1.5~/glcddrivers/gu126x64D-K610A4.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/gu126x64D-K610A4.c 2008-11-12 19:41:51.000000000 +0100
-@@ -25,6 +25,8 @@
- #include <syslog.h>
- #include <unistd.h>
- #include <sys/time.h>
-+#include <cstring>
-+#include <cstdlib>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/gu140x32f.c graphlcd-base-0.1.5/glcddrivers/gu140x32f.c
---- graphlcd-base-0.1.5~/glcddrivers/gu140x32f.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/gu140x32f.c 2008-11-12 19:41:51.000000000 +0100
-@@ -21,6 +21,7 @@
- #include <syslog.h>
- #include <unistd.h>
- #include <sys/time.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/gu256x64-372.c graphlcd-base-0.1.5/glcddrivers/gu256x64-372.c
---- graphlcd-base-0.1.5~/glcddrivers/gu256x64-372.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/gu256x64-372.c 2008-11-12 19:41:51.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <syslog.h>
- #include <unistd.h>
- #include <sys/time.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/gu256x64-3900.c graphlcd-base-0.1.5/glcddrivers/gu256x64-3900.c
---- graphlcd-base-0.1.5~/glcddrivers/gu256x64-3900.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/gu256x64-3900.c 2008-11-12 19:41:51.000000000 +0100
-@@ -29,6 +29,7 @@
- #include <unistd.h>
- #include <termios.h>
- #include <sys/time.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/hd61830.c graphlcd-base-0.1.5/glcddrivers/hd61830.c
---- graphlcd-base-0.1.5~/glcddrivers/hd61830.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/hd61830.c 2008-11-12 19:41:51.000000000 +0100
-@@ -11,6 +11,7 @@
-
- #include <syslog.h>
- #include <sys/time.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/image.c graphlcd-base-0.1.5/glcddrivers/image.c
---- graphlcd-base-0.1.5~/glcddrivers/image.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/image.c 2008-11-12 19:41:51.000000000 +0100
-@@ -12,6 +12,7 @@
-
- #include <stdio.h>
- #include <syslog.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/ks0108.c graphlcd-base-0.1.5/glcddrivers/ks0108.c
---- graphlcd-base-0.1.5~/glcddrivers/ks0108.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/ks0108.c 2008-11-12 19:41:51.000000000 +0100
-@@ -11,6 +11,7 @@
-
- #include <syslog.h>
- #include <sys/time.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/network.c graphlcd-base-0.1.5/glcddrivers/network.c
---- graphlcd-base-0.1.5~/glcddrivers/network.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/network.c 2008-11-12 19:41:51.000000000 +0100
-@@ -18,6 +18,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <errno.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/noritake800.c graphlcd-base-0.1.5/glcddrivers/noritake800.c
---- graphlcd-base-0.1.5~/glcddrivers/noritake800.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/noritake800.c 2008-11-12 19:41:51.000000000 +0100
-@@ -34,6 +34,7 @@
- #include <syslog.h>
- #include <unistd.h>
- #include <sys/time.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/sed1330.c graphlcd-base-0.1.5/glcddrivers/sed1330.c
---- graphlcd-base-0.1.5~/glcddrivers/sed1330.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/sed1330.c 2008-11-12 19:41:51.000000000 +0100
-@@ -19,6 +19,8 @@
-
- #include <syslog.h>
- #include <sys/time.h>
-+#include <cstring>
-+#include <cstdlib>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/sed1520.c graphlcd-base-0.1.5/glcddrivers/sed1520.c
---- graphlcd-base-0.1.5~/glcddrivers/sed1520.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/sed1520.c 2008-11-12 19:41:51.000000000 +0100
-@@ -11,6 +11,7 @@
-
- #include <syslog.h>
- #include <sys/time.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/simlcd.c graphlcd-base-0.1.5/glcddrivers/simlcd.c
---- graphlcd-base-0.1.5~/glcddrivers/simlcd.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/simlcd.c 2008-11-12 19:41:51.000000000 +0100
-@@ -13,6 +13,7 @@
-
- #include <stdio.h>
- #include <syslog.h>
-+#include <cstring>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcddrivers/t6963c.c graphlcd-base-0.1.5/glcddrivers/t6963c.c
---- graphlcd-base-0.1.5~/glcddrivers/t6963c.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcddrivers/t6963c.c 2008-11-12 19:41:51.000000000 +0100
-@@ -12,6 +12,8 @@
- */
-
- #include <syslog.h>
-+#include <cstring>
-+#include <cstdlib>
-
- #include "common.h"
- #include "config.h"
-diff -urNad graphlcd-base-0.1.5~/glcdgraphics/glcd.c graphlcd-base-0.1.5/glcdgraphics/glcd.c
---- graphlcd-base-0.1.5~/glcdgraphics/glcd.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcdgraphics/glcd.c 2008-11-12 19:41:51.000000000 +0100
-@@ -16,7 +16,7 @@
- #include <stdint.h>
- #include <syslog.h>
-
--#include <string>
-+#include <cstring>
-
- #include "bitmap.h"
- #include "glcd.h"
-diff -urNad graphlcd-base-0.1.5~/glcdgraphics/pbm.c graphlcd-base-0.1.5/glcdgraphics/pbm.c
---- graphlcd-base-0.1.5~/glcdgraphics/pbm.c 2007-02-25 18:41:31.000000000 +0100
-+++ graphlcd-base-0.1.5/glcdgraphics/pbm.c 2008-11-12 19:41:51.000000000 +0100
-@@ -12,8 +12,9 @@
- #include <stdio.h>
- #include <stdint.h>
- #include <syslog.h>
-+#include <cstdlib>
-
--#include <string>
-+#include <cstring>
-
- #include "bitmap.h"
- #include "pbm.h"
-diff -urNad graphlcd-base-0.1.5~/tools/convpic/bmp.c graphlcd-base-0.1.5/tools/convpic/bmp.c
---- graphlcd-base-0.1.5~/tools/convpic/bmp.c 2007-02-25 18:41:30.000000000 +0100
-+++ graphlcd-base-0.1.5/tools/convpic/bmp.c 2008-11-12 19:41:51.000000000 +0100
-@@ -29,8 +29,8 @@
- #include <stdio.h>
- #include <stdint.h>
- #include <string.h>
--
--#include <string>
-+#include <cstring>
-+#include <cstdlib>
-
- #include <glcdgraphics/bitmap.h>
- #include <glcdgraphics/image.h>
diff --git a/debian/rules b/debian/rules
index 00a8064..3028908 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,10 @@ else
endif
# To use dpatch uncomment the following line and set Build-Depends to dpatch
-DPATCH=yes
+#DPATCH=yes
ifdef DPATCH
-include /usr/share/dpatch/dpatch.make
+#include /usr/share/dpatch/dpatch.make
else
patch:
patch-stamp:
@@ -26,7 +26,7 @@ build-stamp: patch-stamp
dh_testdir
# Add here commands to compile the package.
- $(MAKE)
+ $(MAKE) HAVE_AX206DPF_EXPERIMENTAL=1
touch build-stamp
@@ -37,7 +37,7 @@ clean-patched:
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) clean
+ -$(MAKE) HAVE_AX206DPF_EXPERIMENTAL=1 clean
dh_clean
@@ -81,7 +81,7 @@ binary-arch: build install
# dh_python
dh_makeshlibs -V
dh_installdeb
- dh_shlibdeps -l debian/libglcddrivers1/usr/lib:debian/libglcdgraphics2/usr/lib
+ dh_shlibdeps -l debian/libglcddrivers1/usr/lib:debian/libglcdgraphics2/usr/lib:debian/libglcdskins1/usr/lib
dh_gencontrol
dh_md5sums
dh_builddeb
--
graphlcd-base packaging repository
More information about the pkg-vdr-dvb-changes
mailing list