[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 941c9160bf1a3eb3e40f5b89751bc1a62a6dc362
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jul 24 23:32:15 2011 +0200

    Adjusted to libjpeg8-dev

diff --git a/debian/control b/debian/control
index 865ecee..675acfc 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 7.0.50~), po-debconf, dh-buildinfo, pkg-config (>=
  zlib1g-dev, libssl-dev, libcurl4-openssl-dev (>= 7.17.1),
  libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libnotify-dev,
  freeglut3-dev, libwxgtk2.8-dev, libgtk2.0-dev,
- libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg62-dev,
+ libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg8-dev
 Homepage: http://boinc.berkeley.edu/
 Vcs-Git: git://git.debian.org/git/pkg-boinc/boinc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-boinc/boinc.git
diff --git a/debian/patches/texfont_removal.patch b/debian/patches/texfont_removal.patch
index 296e7ac..c5cbbaf 100644
--- a/debian/patches/texfont_removal.patch
+++ b/debian/patches/texfont_removal.patch
@@ -1,8 +1,8 @@
 Index: boinc/api/Makefile.am
 ===================================================================
---- 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 @@
+--- 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 \
@@ -11,15 +11,17 @@ Index: boinc/api/Makefile.am
 -    txf_util.cpp \
      graphics2.cpp \
      graphics2_unix.cpp
-+    #texfont.cpp \
-+    #txf_util.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:28:53.000000000 +0200
-+++ boinc/api/txf_util.cpp	2011-07-24 23:29:47.000000000 +0200
+--- 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"
@@ -40,8 +42,8 @@ Index: boinc/api/txf_util.cpp
  //
 Index: boinc/api/txf_util.h
 ===================================================================
---- 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
+--- 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_

-- 
BOINC packaging