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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 413162cd86baad29b68578654d13087b085c2ff3
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jul 24 23:30:21 2011 +0200

    helped patch on texfont issue

diff --git a/debian/patches/texfont_removal.patch b/debian/patches/texfont_removal.patch
index 8683b7b..296e7ac 100644
--- a/debian/patches/texfont_removal.patch
+++ b/debian/patches/texfont_removal.patch
@@ -1,21 +1,25 @@
 Index: boinc/api/Makefile.am
 ===================================================================
---- boinc.orig/api/Makefile.am	2011-06-04 20:01:48.000000000 +0200
-+++ boinc/api/Makefile.am	2011-06-04 20:02:50.000000000 +0200
-@@ -16,9 +16,7 @@
- 	gutil.cpp \
- 	gutil_text.cpp \
- 	reduce_lib.cpp \
--	texfont.cpp \
- 	texture.cpp \
--	txf_util.cpp \
- 	graphics2.cpp \
- 	graphics2_unix.cpp
+--- boinc.orig/api/Makefile.am	2011-07-24 23:28:34.000000000 +0200
++++ boinc/api/Makefile.am	2011-07-24 23:30:06.000000000 +0200
+@@ -16,11 +16,11 @@
+     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
 Index: boinc/api/txf_util.cpp
 ===================================================================
---- boinc.orig/api/txf_util.cpp	2011-06-04 20:01:23.000000000 +0200
-+++ boinc/api/txf_util.cpp	2011-06-04 20:02:10.000000000 +0200
+--- boinc.orig/api/txf_util.cpp	2011-07-24 23:28:53.000000000 +0200
++++ boinc/api/txf_util.cpp	2011-07-24 23:29:47.000000000 +0200
 @@ -26,14 +26,15 @@
  #include "filesys.h"
  #include "boinc_api.h"
@@ -36,8 +40,8 @@ Index: boinc/api/txf_util.cpp
  //
 Index: boinc/api/txf_util.h
 ===================================================================
---- boinc.orig/api/txf_util.h	2011-06-04 20:01:23.000000000 +0200
-+++ boinc/api/txf_util.h	2011-06-04 20:02:10.000000000 +0200
+--- boinc.orig/api/txf_util.h	2011-07-24 23:28:53.000000000 +0200
++++ boinc/api/txf_util.h	2011-07-24 23:29:47.000000000 +0200
 @@ -21,6 +21,8 @@
  #ifndef _TXF_UTIL_
  #define _TXF_UTIL_

-- 
BOINC packaging