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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit ccaa6919cdd3efcd715529555417140408b17d54
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Dec 27 21:58:07 2010 +0100

    Added some dependencies announced in documentation
    
    Compare with http://boinc.berkeley.edu/trac/wiki/SoftwarePrereqsUnix

diff --git a/debian/control b/debian/control
index 921c96a..39b0b6c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.0.17ubuntu2), po-debconf, dh-buildinfo,
  autoconf (>= 2.59), libxml2-utils, gettext, zlib1g-dev, libssl-dev,
  libcurl4-openssl-dev (>= 7.17.1), freeglut3-dev, libsm-dev, libice-dev,
  libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.8-dev,
- libsqlite3-dev, quilt, libgtk2.0-dev, libxcb-atom1-dev
+ libsqlite3-dev, quilt, libgtk2.0-dev, libxcb-atom1-dev, pkg-config (>= 0.15)
 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
@@ -99,8 +99,8 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-mysqldb,
  mysql-server-5.0 | virtual-mysql-server, apache2 | httpd-cgi, php5, php5-cli,
- php5-mysql, tcsh | c-shell
-Recommends: libapache2-mod-php5
+ php5-mysql, tcsh | c-shell, openssl (>= 0.9.8), libcurl
+Recommends: libapache2-mod-php5, php5-gd
 Description: BOINC server applications and data files
  The Berkeley Open Infrastructure for Network Computing (BOINC) is a
  software platform for distributed computing using volunteered computer
diff --git a/debian/patches/MakefileWrapper.patch b/debian/patches/MakefileWrapper.patch
new file mode 100644
index 0000000..4a4ab19
--- /dev/null
+++ b/debian/patches/MakefileWrapper.patch
@@ -0,0 +1,32 @@
+Index: boinc/samples/wrapper/Makefile
+===================================================================
+--- boinc.orig/samples/wrapper/Makefile	2010-12-27 21:25:36.000000000 +0100
++++ boinc/samples/wrapper/Makefile	2010-12-27 21:23:51.000000000 +0100
+@@ -1,7 +1,7 @@
+ # This should work on Linux.  Modify as needed for other platforms.
+ 
+ # Change the following to match your installation
+-BOINC_DIR = ../..
++BOINC_DIR = /usr/include/boinc
+ BOINC_API_DIR = $(BOINC_DIR)/api
+ BOINC_LIB_DIR = $(BOINC_DIR)/lib
+ 
+@@ -20,11 +20,17 @@
+ libstdc++.a:
+ 	ln -s `g++ -print-file-name=libstdc++.a`
+ 
++libboinc.a:
++	ln -s `g++ $(CXXFLAGS) -print-file-name=libboinc.a`
++
++libboinc_api.a:
++	ln -s `g++ $(CXXFLAGS) -print-file-name=libboinc_api.a`
++
+ clean:
+ 	rm $(PROGS) *.o
+ 
+ distclean:
+ 	/bin/rm -f $(PROGS) *.o libstdc++.a
+ 
+-wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
++wrapper: wrapper.o libstdc++.a libboinc.a libboinc_api.a
+ 	g++ $(CXXFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc

-- 
BOINC packaging