[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-45-g1ccbe2a

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 1ccbe2a82435f25464f13d337bd758e310dac39b
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jul 18 22:33:14 2010 +0200

    api/texfont* can now be removed.
    
    Upstream clarified that it is only used for the screen saver
    which is not used under Linux.

diff --git a/debian/patches/series b/debian/patches/series
index 5ec30e8..4a1b74b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 003_use_sensible-browser.patch 
 006_correct_catalog_path.patch
 200_don-t-assume_SCHED_BATCH_exist.patch
+texfont_removal.patch
diff --git a/debian/patches/texfont_removal.patch b/debian/patches/texfont_removal.patch
new file mode 100644
index 0000000..ef62a1f
--- /dev/null
+++ b/debian/patches/texfont_removal.patch
@@ -0,0 +1,54 @@
+Index: boinc/api/Makefile.am
+===================================================================
+--- boinc.orig/api/Makefile.am	2010-07-18 22:04:47.000000000 +0200
++++ boinc/api/Makefile.am	2010-07-18 22:09:39.000000000 +0200
+@@ -16,12 +16,12 @@
+     gutil.cpp \
+     gutil_text.cpp \
+     reduce_lib.cpp \
+-    texfont.cpp \
+     texture.cpp \
+-    txf_util.cpp \
+     graphics2.cpp \
+     graphics2_unix.cpp
+ 
++# removed:  texfont.cpp txf_util.cpp
++
+ if OS_DARWIN
+     graphics2_files += mac_icon.cpp
+     graphics2_files += macglutfix.m
+Index: boinc/api/txf_util.cpp
+===================================================================
+--- boinc.orig/api/txf_util.cpp	2010-07-18 22:03:58.000000000 +0200
++++ boinc/api/txf_util.cpp	2010-07-18 22:08:53.000000000 +0200
+@@ -26,14 +26,15 @@
+ #include "filesys.h"
+ #include "boinc_api.h"
+ 
+-#include "texfont.h"
++//#include "texfont.h"
+ #include "txf_util.h"
+ 
+ #ifndef _MAX_PATH
+ #define _MAX_PATH 256
+ #endif 
+ 
+-static TexFont* txf[TXF_NUM_FONT];
++//static TexFont* txf[TXF_NUM_FONT];
++static void* txf[TXF_NUM_FONT];
+ 
+ // load fonts. call once.
+ //
+Index: boinc/api/txf_util.h
+===================================================================
+--- boinc.orig/api/txf_util.h	2010-07-18 22:07:21.000000000 +0200
++++ boinc/api/txf_util.h	2010-07-18 22:07:36.000000000 +0200
+@@ -21,6 +21,8 @@
+ #ifndef _TXF_UTIL_
+ #define _TXF_UTIL_
+ 
++#include <GL/gl.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif

-- 
BOINC packaging