[SCM] BOINC packaging branch, master, updated. upstream/7.0.28+dfsg-447-gb8ff311

[Steffen Moeller]

The following commit has been merged in the master branch:
commit b8ff311d2893d274382f5ff3e75f3b99b08bbcaa
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Tue May 22 01:01:53 2012 +0200

    Adjusting changelog for screensaver work.

diff --git a/debian/changelog b/debian/changelog
index 4bdeb2e..263f81b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-boinc (7.0.28+dfsg-1) unstable; urgency=low
+boinc (7.0.28+dfsg-1) UNRELEASED; urgency=low
+
+  *  Building the screensaver again (Steffen and Bernd)
+
+ -- Steffen Moeller <moeller at debian.org>  Tue, 22 May 2012 01:01:39 +0200
+
+boinc (7.0.28+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream version.
   * Adding hardening flags.
diff --git a/debian/patches/0002-re-enable-X11-screensaver-build.patch b/debian/patches/0002-re-enable-X11-screensaver-build.patch
index d007099..d42e63b 100644
--- a/debian/patches/0002-re-enable-X11-screensaver-build.patch
+++ b/debian/patches/0002-re-enable-X11-screensaver-build.patch
@@ -7,11 +7,11 @@ Subject: [PATCH 2/2] re-enable X11 screensaver build
  Makefile.am |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index 0c2ea14..f74a363 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -22,9 +22,9 @@ endif
+Index: boinc/Makefile.am
+===================================================================
+--- boinc.orig/Makefile.am	2012-05-18 14:28:57.925461036 +0200
++++ boinc/Makefile.am	2012-05-22 01:03:09.000000000 +0200
+@@ -22,9 +22,9 @@
  
  if ENABLE_MANAGER
     CLIENTGUI_SUBDIRS = clientgui locale
@@ -24,6 +24,15 @@ index 0c2ea14..f74a363 100644
  endif
  
  # ORDER MATTERS below.  One must build dependencies FIRST, then things
--- 
-1.7.10.1
-
+Index: boinc/clientscr/Makefile.am
+===================================================================
+--- boinc.orig/clientscr/Makefile.am	2012-03-31 13:44:23.051165746 +0200
++++ boinc/clientscr/Makefile.am	2012-05-22 01:12:36.804981415 +0200
+@@ -3,6 +3,7 @@
+ 
+ include $(top_srcdir)/Makefile.incl
+ 
++AM_LDFLAGS += -lpthread
+ if ENABLE_CLIENT_RELEASE
+   AM_LDFLAGS += -static-libtool-libs
+ ## for an entirely statically linked library, you may want to try

-- 
BOINC packaging