[SCM] BOINC packaging branch, wheezy, updated. debian/7.0.27+dfsg-5-15-g43ed716

[Guo Yixuan]

The following commit has been merged in the wheezy branch:
commit 6405ed30f8829d009ecf191f5aac17a0bd1b5ecf
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Wed Jan 16 15:13:49 2013 +0800

    Added -lX11 for linking with ld.gold
    
    Conflicts:
    	debian/changelog
    	debian/control.in
    	debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 4aaecb3..9e5a2af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ boinc (7.0.27+dfsg-6) UNRELEASED; urgency=low
   * Removed the deprecated DMUA field from debian/control.
   * Bump policy version to 3.9.4, and use branch in Vcs-Git.
   * Tried to fix CVE-2013-2298.
+  * Added libx11-dev to build-deps. (It's used directly in
+    client/hostinfo_unix.cpp.)
+  * link_with_gold.patch: patched configure.ac to add -lX11 for linking client
+    with ld.gold.
 
  -- Guo Yixuan <culu.gyx at gmail.com>  Mon, 24 Jun 2013 17:12:15 +0800
 
diff --git a/debian/control b/debian/control
index fc36d75..68a5e51 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 7.0.50~), po-debconf, dh-buildinfo, pkg-config (>=
  freeglut3-dev, libwxgtk2.8-dev, libgtk2.0-dev,
  libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg-dev,
  libxcb-util0-dev,
- libxss-dev
+ libx11-dev, libxss-dev
 Homepage: http://boinc.berkeley.edu/
 Vcs-Git: git://git.debian.org/git/pkg-boinc/boinc.git -b sid
 Vcs-Browser: http://git.debian.org/?p=pkg-boinc/boinc.git
diff --git a/debian/patches/link_with_gold.patch b/debian/patches/link_with_gold.patch
new file mode 100644
index 0000000..17c49dd
--- /dev/null
+++ b/debian/patches/link_with_gold.patch
@@ -0,0 +1,14 @@
+Index: boinc/configure.ac
+===================================================================
+--- boinc.orig/configure.ac
++++ boinc/configure.ac
+@@ -851,6 +851,9 @@
+     SAH_CHECK_LIB([Xss],[XScreenSaverAllocInfo],[
+         AC_DEFINE([HAVE_XSS],[1],[Define to 1 if you have xss library])
+         CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
++    SAH_CHECK_LIB([X11],[XOpenDisplay],[
++        AC_DEFINE([HAVE_X11],[1],[Define to 1 if you have X11 library])
++        CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+     echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+ fi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1e5477e..ba4c3ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -59,3 +59,4 @@ boinc_manager_project_info_page.patch
 add_hardening_flags.patch
 workaround-objcxx.patch
 CVE-2013-2298-Scheduler-fix-security-vulnerabilities.patch
+link_with_gold.patch

-- 
BOINC packaging