[SCM] BOINC packaging branch, master, updated. debian/7.0.27+dfsg-3-70-g14393c6

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 6de5595d2815270180bd41104ff55fa789eee587
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Wed Aug 1 21:04:00 2012 +0200

    Updates for 7.0.32

diff --git a/debian/changelog b/debian/changelog
index 771bd9d..79c79d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-boinc (7.0.31+dfsg-1) UNRELEASED; urgency=low
+boinc (7.0.32+dfsg-1) UNRELEASED; urgency=low
+
+  [ Steffen Moeller ]
+  * New upstream version.
+
+ -- Guo Yixuan <culu.gyx at gmail.com>  Wed, 01 Aug 2012 21:02:49 +0200
+
+boinc (7.0.31+dfsg-1) unstable; urgency=low
 
   [ Steffen Moeller ]
   * New upstream version.
diff --git a/debian/patches/clang_incompatibilities.patch b/debian/patches/clang_incompatibilities.patch
index fed9602..e3458f9 100644
--- a/debian/patches/clang_incompatibilities.patch
+++ b/debian/patches/clang_incompatibilities.patch
@@ -2,8 +2,8 @@ Author: Steffen Moeller <steffen.moeller at uk-sh.de>
 Description: Tested compatibility with clang.
 Index: boinc/lib/Makefile.am
 ===================================================================
---- boinc.orig/lib/Makefile.am	2012-05-19 12:21:48.983806017 +0200
-+++ boinc/lib/Makefile.am	2012-05-19 12:22:11.987487371 +0200
+--- boinc.orig/lib/Makefile.am	2012-08-01 20:48:02.126264079 +0200
++++ boinc/lib/Makefile.am	2012-08-01 20:52:55.174302455 +0200
 @@ -147,13 +147,13 @@
  libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
  libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -22,9 +22,9 @@ Index: boinc/lib/Makefile.am
  if ENABLE_FCGI
 Index: boinc/lib/util.cpp
 ===================================================================
---- boinc.orig/lib/util.cpp	2012-05-19 12:21:48.983806017 +0200
-+++ boinc/lib/util.cpp	2012-05-19 12:22:11.991487316 +0200
-@@ -310,7 +310,7 @@
+--- boinc.orig/lib/util.cpp	2012-08-01 20:52:04.670985198 +0200
++++ boinc/lib/util.cpp	2012-08-01 20:52:55.182302347 +0200
+@@ -311,7 +311,7 @@
  #ifdef _WIN32
      DebugBreak();
  #else
@@ -35,8 +35,8 @@ Index: boinc/lib/util.cpp
  
 Index: boinc/sched/make_work.cpp
 ===================================================================
---- boinc.orig/sched/make_work.cpp	2012-05-19 12:21:48.983806017 +0200
-+++ boinc/sched/make_work.cpp	2012-05-19 12:22:11.999487205 +0200
+--- boinc.orig/sched/make_work.cpp	2012-08-01 20:48:02.126264079 +0200
++++ boinc/sched/make_work.cpp	2012-08-01 20:52:55.186302294 +0200
 @@ -176,9 +176,6 @@
      char keypath[MAXPATHLEN];
      char buf[BLOB_SIZE];
diff --git a/debian/patches/mac_addresses_cores_in_kfreebsd.patch b/debian/patches/mac_addresses_cores_in_kfreebsd.patch
index 51beb8d..aeb2e3b 100644
--- a/debian/patches/mac_addresses_cores_in_kfreebsd.patch
+++ b/debian/patches/mac_addresses_cores_in_kfreebsd.patch
@@ -3,9 +3,9 @@ Description: Helping verbosity of error messages.
 
 Index: boinc/lib/mac_address.cpp
 ===================================================================
---- boinc.orig/lib/mac_address.cpp	2012-03-03 01:12:22.000000000 +0100
-+++ boinc/lib/mac_address.cpp	2012-03-03 01:14:00.000000000 +0100
-@@ -144,6 +144,10 @@
+--- boinc.orig/lib/mac_address.cpp	2012-08-01 20:52:26.394691521 +0200
++++ boinc/lib/mac_address.cpp	2012-08-01 20:52:31.046628633 +0200
+@@ -145,6 +145,10 @@
  
  bool
  get_mac_addresses(char* addresses) {
@@ -16,7 +16,7 @@ Index: boinc/lib/mac_address.cpp
  #if defined(_WIN32)
      IP_ADAPTER_INFO AdapterInfo[16]; // Allocate information for up to 16 NICs
  	DWORD dwBufLen = sizeof(AdapterInfo); // Save memory size of buffer
-@@ -264,6 +268,10 @@
+@@ -265,6 +269,10 @@
          }
          hw_addr=(struct ether_addr *)&(item->lifr_lifru.lifru_enaddr);  
  #endif
diff --git a/debian/patches/nvidia_mem_display_simplification.patch b/debian/patches/nvidia_mem_display_simplification.patch
index 82c1e89..5d5d3c8 100644
--- a/debian/patches/nvidia_mem_display_simplification.patch
+++ b/debian/patches/nvidia_mem_display_simplification.patch
@@ -1,11 +1,11 @@
 Index: boinc/lib/coproc.cpp
 ===================================================================
---- boinc.orig/lib/coproc.cpp	2012-06-30 21:59:10.012848816 +0200
-+++ boinc/lib/coproc.cpp	2012-06-30 22:00:39.043650160 +0200
+--- boinc.orig/lib/coproc.cpp	2012-08-01 20:55:51.707915924 +0200
++++ boinc/lib/coproc.cpp	2012-08-01 20:56:08.403690215 +0200
 @@ -480,7 +480,7 @@
+     cuda_version = 0;
      display_driver_version = 0;
      strcpy(prop.name, "");
-     prop.deviceHandle = 0;
 -    prop.totalGlobalMem = 0;
 +    prop.totalGlobalMem = 0.0;
      prop.sharedMemPerBlock = 0;
diff --git a/debian/patches/uninitialised_client_states.patch b/debian/patches/uninitialised_client_states.patch
index 49346d0..d67f9d4 100644
--- a/debian/patches/uninitialised_client_states.patch
+++ b/debian/patches/uninitialised_client_states.patch
@@ -2,9 +2,9 @@ Author: Steffen Moeller <moeller at debian.org>
 Description: Valgrind indicated some values for a jump not to be initialised. This addresses it.
 Index: boinc/client/client_state.cpp
 ===================================================================
---- boinc.orig/client/client_state.cpp	2012-05-03 13:46:54.964902713 +0200
-+++ boinc/client/client_state.cpp	2012-05-03 13:53:07.275804022 +0200
-@@ -141,7 +141,7 @@
+--- boinc.orig/client/client_state.cpp	2012-08-01 20:52:04.530987091 +0200
++++ boinc/client/client_state.cpp	2012-08-01 20:52:48.338394869 +0200
+@@ -142,7 +142,7 @@
  #endif
      launched_by_manager = false;
      initialized = false;

-- 
BOINC packaging