r584 - in /branches/experimental/boinc/debian: changelog patches/00list patches/01_amd64-disable-platform-reset.dpatch

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

Author: fst-guest
Date: Thu Feb 15 11:11:41 2007
New Revision: 584

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=584
Log:
* Updated 01_amd64-disable-platform-reset.dpatch. Since the upstream code
  already checks if statefile_platform_name is empty, #407461 should not happen
  with 5.8.
* Updated to 5.8.12.

Modified:
    branches/experimental/boinc/debian/changelog
    branches/experimental/boinc/debian/patches/00list
    branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch

Modified: branches/experimental/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/changelog?rev=584&op=diff
==============================================================================
--- branches/experimental/boinc/debian/changelog (original)
+++ branches/experimental/boinc/debian/changelog Thu Feb 15 11:11:41 2007
@@ -1,4 +1,4 @@
-boinc (5.8.11-1) experimental; urgency=low
+boinc (5.8.12-1) experimental; urgency=low
 
   * NOT RELEASED YET
 
@@ -42,7 +42,7 @@
   * Change the permissions of boinc-client's conffiles in it's postinst to
     0640 root:boinc instead of 0644 boinc:boinc. (closes: #407678)
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Sun, 11 Feb 2007 15:28:14 +0100
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Thu, 15 Feb 2007 11:04:43 +0100
 
 boinc (5.4.11-4) unstable; urgency=low
 

Modified: branches/experimental/boinc/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/00list?rev=584&op=diff
==============================================================================
--- branches/experimental/boinc/debian/patches/00list (original)
+++ branches/experimental/boinc/debian/patches/00list Thu Feb 15 11:11:41 2007
@@ -1,4 +1,4 @@
-#01_amd64-disable-platform-reset.dpatch
+01_amd64-disable-platform-reset.dpatch
 04_sched-makefile.am.dpatch
 07_use-sensible-browser.dpatch
 10_exclude-sea.dpatch

Modified: branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch?rev=584&op=diff
==============================================================================
--- branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch (original)
+++ branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch Thu Feb 15 11:11:41 2007
@@ -7,24 +7,24 @@
 ## DP: http://lists.alioth.debian.org/pipermail/pkg-boinc-devel/2006-August/000350.html
 
 @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 @@
+diff -urNad boinc-5.8.11~/client/client_state.C boinc-5.8.11/client/client_state.C
+--- boinc-5.8.11~/client/client_state.C	2007-02-07 07:12:39.000000000 +0100
++++ boinc-5.8.11/client/client_state.C	2007-02-15 10:56:52.000000000 +0100
+@@ -318,6 +318,9 @@
      // This could happen e.g. if user copies files from PPC to Intel Mac
      //
-     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
          msg_printf(NULL, MSG_INFO,
              "Platform changed from %s to %s - resetting projects",
              statefile_platform_name.c_str(), platform_name
-@@ -339,6 +342,7 @@
+@@ -326,6 +329,7 @@
              p = projects[i];
              reset_project(p);
          }
 +#endif
      }
  
-     return 0;
+ #if (defined(SANDBOX) && ! defined(_WIN32))