[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-53-g96518d5

[Guo Yixuan]

The following commit has been merged in the master branch:
commit 96518d5b92c887b20d61b9a00eb72d751d6b47c1
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Sat Sep 22 23:58:27 2012 +0800

    texfont is already removed upstream

diff --git a/debian/patches/texfont_removal.patch b/debian/patches/texfont_removal.patch
deleted file mode 100644
index 47e0022..0000000
--- a/debian/patches/texfont_removal.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Author: Frank Thomas
-Index: boinc/api/Makefile.am
-===================================================================
---- boinc.orig/api/Makefile.am	2011-07-24 23:32:32.000000000 +0200
-+++ boinc/api/Makefile.am	2011-07-24 23:36:55.000000000 +0200
-@@ -16,12 +16,13 @@
-     gutil.cpp \
-     gutil_text.cpp \
-     reduce_lib.cpp \
--    texfont.cpp \
-     texture.cpp \
--    txf_util.cpp \
-     graphics2.cpp \
-     graphics2_unix.cpp
- 
-+#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	2011-07-24 23:32:32.000000000 +0200
-+++ boinc/api/txf_util.cpp	2011-07-24 23:32:47.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	2011-07-24 23:32:32.000000000 +0200
-+++ boinc/api/txf_util.h	2011-07-24 23:32:47.000000000 +0200
-@@ -21,6 +21,8 @@
- #ifndef _TXF_UTIL_
- #define _TXF_UTIL_
- 
-+#include <GL/gl.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif

-- 
BOINC packaging