r589 - in /trunk/boinc/debian: changelog patches/01_amd64-disable-platform-reset.dpatch patches/14_cpuinfo-sparc.dpatch

[fst-guest at users.alioth.debian.org]

Author: fst-guest
Date: Sat Mar 10 08:01:21 2007
New Revision: 589

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=589
Log:
Backported the fix from 5.8 for #407461. I'm not sure if we should release
5.4.11-5 before etch but if we do, this fix should go into etch.

Modified:
    trunk/boinc/debian/changelog
    trunk/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch
    trunk/boinc/debian/patches/14_cpuinfo-sparc.dpatch   (props changed)

Modified: trunk/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/changelog?rev=589&op=diff
==============================================================================
--- trunk/boinc/debian/changelog (original)
+++ trunk/boinc/debian/changelog Sat Mar 10 08:01:21 2007
@@ -1,8 +1,11 @@
 boinc (5.4.11-5) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Fri,  8 Dec 2006 19:34:29 +0100
+  * debian/patches/:
+    - 01_amd64-disable-platform-reset.dpatch: Only reset projects if the
+      platform name in the statefile is not empty. (closes: #407461)
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sat, 10 Mar 2007 08:44:23 +0100
 
 boinc (5.4.11-4) unstable; urgency=low
 

Modified: trunk/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch?rev=589&op=diff
==============================================================================
--- trunk/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch (original)
+++ trunk/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch Sat Mar 10 08:01:21 2007
@@ -9,11 +9,13 @@
 @DPATCH@
 diff -urNad boinc-5.4.11~/client/client_state.C boinc-5.4.11/client/client_state.C
 --- boinc-5.4.11~/client/client_state.C	2006-08-03 10:31:03.000000000 +0200
-+++ boinc-5.4.11/client/client_state.C	2006-08-26 14:01:36.000000000 +0200
-@@ -331,6 +331,9 @@
++++ boinc-5.4.11/client/client_state.C	2007-03-10 08:42:17.000000000 +0100
+@@ -330,7 +330,10 @@
+     // Has platform name changed?  If so reset all.
      // This could happen e.g. if user copies files from PPC to Intel Mac
      //
-     if (strcmp(platform_name, statefile_platform_name.c_str())) {
+-    if (strcmp(platform_name, statefile_platform_name.c_str())) {
++    if (statefile_platform_name.size() && strcmp(platform_name, statefile_platform_name.c_str())) {
 +#ifdef __x86_64__
 +        platform_name = strdup(statefile_platform_name.c_str());
 +#else

Propchange: trunk/boinc/debian/patches/14_cpuinfo-sparc.dpatch
------------------------------------------------------------------------------
    svn:executable = *