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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit c7cddb24b5a0eeb16036062fc1b46e4973c870a7
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Mon May 28 15:44:38 2012 +0200

    Not applying sensor patch.

diff --git a/debian/patches/series b/debian/patches/series
index bf2ce07..7ce4bcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,4 +56,4 @@ unlink_undefined.patch
 0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
 0002-re-enable-X11-screensaver-build.patch
 screen_saver_boinc_extra.patch
-socklenBuildFixByDavid.patch
+#socklenBuildFixByDavid.patch
diff --git a/debian/patches/socklenBuildFixByDavid.patch b/debian/patches/socklenBuildFixByDavid.patch
index 353d6cf..e891c4e 100644
--- a/debian/patches/socklenBuildFixByDavid.patch
+++ b/debian/patches/socklenBuildFixByDavid.patch
@@ -1,7 +1,7 @@
 Index: boinc/lib/network.h
 ===================================================================
 --- boinc.orig/lib/network.h	2012-05-28 12:30:21.326797803 +0200
-+++ boinc/lib/network.h	2012-05-28 15:06:29.703775442 +0200
++++ boinc/lib/network.h	2012-05-28 15:07:10.631217544 +0200
 @@ -54,10 +54,7 @@
  extern const char* socket_error_str();
  extern void reset_dns();
@@ -10,7 +10,7 @@ Index: boinc/lib/network.h
 -typedef int BOINC_SOCKLEN_T;
 -#endif
 -
-+#typedef int BOINC_SOCKLEN_T;
++typedef int BOINC_SOCKLEN_T;
  #if defined(_WIN32) && defined(USE_WINSOCK)
  extern int WinsockInitialize();
  extern int WinsockCleanup();

-- 
BOINC packaging