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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 1b982b863cd7ac3b0c2b1c8bc09819dca89f89b1
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..9713fc0 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-2) 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/control b/debian/control
index 566c2f1..80f8b15 100644
--- a/debian/control
+++ b/debian/control
@@ -106,6 +106,36 @@ Description: core client for the BOINC distributed computing infrastructure
  dynamically download the projects application's program to be then
  wrapped by the BOINC core client.
 
+Package: boinc-screensaver
+Section: x11
+Architecture: any
+Depends:  ${shlibs:Depends}, ${misc:Depends}, boinc-client
+Suggests: boinc-manager
+Description: screen saver auto-controlling volunteer computing
+ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+ software platform for distributed computing: several initiatives of
+ various scientific disciplines all compete for the idle time of
+ desktop computers. The developers' web site at the University of
+ Berkeley serves as a common portal to the otherwise independently run
+ projects.
+ .
+ The BOINC client is configurable by the command line or the BOINC
+ manager's GUI to compute with any range between 0% and 100% of
+ available resources, and to change that ratio to a higher after
+ some user determined duration of inactivity. There is now quite
+ a number of individuals who prefer to have everything presented
+ with their accustomed priciple for setting and choosing a screen
+ saver. Upon inactivity, the BOINC client is started, and stopped
+ again when the user is back. To save the screen, it then shows
+ the graphical progress indication as optionally shown also by
+ the manager.
+ .
+ This package is excellent to further promote BOINC, recalling the
+ effect SETI at Home once had in the Cambridge, UK, CB2 Cybercafe.
+ Just, when using it together with the regular BOINC client setup,
+ it is suggested not to have all CPUs used to avoid multiple
+ processes running on the same core.
+
 
 Package: boinc-manager
 Section: x11
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
diff --git a/debian/patches/screen_saver_boinc_extra.patch b/debian/patches/screen_saver_boinc_extra.patch
new file mode 100644
index 0000000..fc1e35b
--- /dev/null
+++ b/debian/patches/screen_saver_boinc_extra.patch
@@ -0,0 +1,22 @@
+Index: boinc/clientscr/screensaver_x11.cpp
+===================================================================
+--- boinc.orig/clientscr/screensaver_x11.cpp	2012-05-22 01:03:09.000000000 +0200
++++ boinc/clientscr/screensaver_x11.cpp	2012-05-22 23:37:35.829892017 +0200
+@@ -23,7 +23,7 @@
+ //
+ // GL:  boincscr -root  \n\
+ //
+-// If your BOINC directory differs from /var/lib/boinc, you can use
++// If your BOINC directory differs from /var/lib/boinc-client, you can use
+ // the -boinc_dir command line argument.
+ //
+ // When run, this screensaver connects to the BOINC client via RPC, asks for
+@@ -404,7 +404,7 @@
+ {
+   unsigned long int window_id = 0;
+   bool windowed = true;
+-  std::string boinc_wd = "/var/lib/boinc";
++  std::string boinc_wd = "/var/lib/boinc-client";
+ 
+   // parse command line
+   for(int c = 0; c < argc; c++)
diff --git a/debian/patches/series b/debian/patches/series
index 1747ecb..ac5b723 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -55,3 +55,4 @@ api_NULL_not_defined.patch
 unlink_undefined.patch
 0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
 0002-re-enable-X11-screensaver-build.patch
+screen_saver_boinc_extra.patch

-- 
BOINC packaging