[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-72-gb77f56f

Gianfranco Costamagna costamagnagianfranco at yahoo.it
Wed Oct 31 16:52:37 UTC 2012


The following commit has been merged in the master branch:
commit b77f56fc21b33f3dfdc0943afdf013b7cd4ea6af
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Oct 31 17:52:07 2012 +0100

    Little change from Eric J Korpela

diff --git a/debian/patches/missing_libs_wrapper.patch b/debian/patches/missing_libs_wrapper.patch
index 02227b1..f0a4e19 100644
--- a/debian/patches/missing_libs_wrapper.patch
+++ b/debian/patches/missing_libs_wrapper.patch
@@ -1,18 +1,33 @@
 Include some headers file, to fix a problem with getrusage and setpriority functions with the new ubuntu raring ringtail development release
 Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
 Forwarded: <yes>
-Fixed in upstream revision 9223fd2
+Fixed in upstream revision 9223fd2 and 2d0150c
 http://boinc.berkeley.edu/trac/changeset/9223fd22e3b6b848cc9e5e151d958542da8fd49d/boinc
-
+http://boinc.berkeley.edu/trac/changeset/2d0150c6872bd3f0489a90a71e2728c3a8e792fb/boinc
 
 --- boinc-7.0.36+dfsg.orig/samples/wrapper/wrapper.cpp
 +++ boinc-7.0.36+dfsg/samples/wrapper/wrapper.cpp
-@@ -31,6 +31,8 @@
+@@ -29,4 +29,7 @@
+ // Contributor: Andrew J. Younge (ajy4490 at umiacs.umd.edu)
+ 
++#ifndef _WIN32
++#include "config.h"
++#endif
  #include <stdio.h>
  #include <vector>
- #include <string>
-+#include <sys/time.h>
-+#include <sys/resource.h> 
- #ifdef _WIN32
- #include "boinc_win.h"
+@@ -36,7 +39,15 @@
  #include "win_util.h"
+ #else
++#ifdef HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
++#ifdef HAVE_SYS_RESOURCE_H
++#include <sys/resource.h>
++#endif
+ #include <unistd.h>
+ #endif

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list