[SCM] BOINC packaging branch, master, updated. upstream/7.0.44+dfsg-623-gc4e8acc

[Guo Yixuan]

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

    Added -lX11 for linking with ld.gold

diff --git a/debian/changelog b/debian/changelog
index fb41436..c9da739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 boinc (7.0.44+dfsg-1) UNRELEASED; urgency=low
 
+  [ Gianfranco Costamagna ]
   * New upstream release
   * General patch refresh
   * Added libxext-dev and libxcb-dpms0-dev in order to address a long time bug (lp: 179849)
 
+  [ Guo Yixuan ]
+  * 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.
+
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 09 Jan 2013 17:40:34 +0100
 
 boinc (7.0.42+dfsg-1) UNRELEASED; urgency=low
diff --git a/debian/control.in b/debian/control.in
index 663b80d..5ac8889 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 7.0.50~), po-debconf, pkg-config (>= 0.15),
  freeglut3-dev, libwxgtk2.8-dev, libgtk2.0-dev,
  libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg-dev,
  libxcb-util0-dev, libxcb-dpms0-dev,
- libxss-dev, libxext-dev
+ libx11-dev, libxss-dev, libxext-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/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 dc2ae07..2a2ecf0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,3 +63,4 @@ boinclib_shared.patch
 dynamic_libboinc.patch
 Missing_libSched.patch
 missing_libs_wrapper.patch
+link_with_gold.patch

-- 
BOINC packaging