[pkg-boinc-commits] r511 - in /trunk/boinc/debian: changelog patches/00list patches/01_amd64-disable-platform-reset.dpatch

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

Author: fst-guest
Date: Sat Aug 26 12:40:54 2006
New Revision: 511

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=511
Log:
Applied Roberts patch for http://bugs.debian.org/366741.

Added:
    trunk/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch   (with props)
Modified:
    trunk/boinc/debian/changelog
    trunk/boinc/debian/patches/00list

Modified: trunk/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/changelog?rev=511&op=diff
==============================================================================
--- trunk/boinc/debian/changelog (original)
+++ trunk/boinc/debian/changelog Sat Aug 26 12:40:54 2006
@@ -9,12 +9,20 @@
   * debian/control:
     - Removed Greg Norris <adric at debian.org> from the Uploaders field.
   * debian/rules:
-    - Applied patch from Robert Millan which simplifies the platform override
-      for i386. We are now using --target instead of the --build and --host
-      switches. This also needed some changes in boinc-client.install and
-      boinc-manager.install. Thanks Robert for the patch. (closes: #383871)
-
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Thu, 24 Aug 2006 22:27:59 +0200
+    - Applied patch from Robert Millan <rmh at aybabtu.com> which simplifies the
+      platform override for i386. We are now using --target instead of the
+      --build and --host switches. This also needed some changes in
+      boinc-client.install and boinc-manager.install. Thanks Robert for the
+      patch. (closes: #383871)
+  * debian/patches/:
+    - Added 01_amd64-disable-platform-reset.dpatch from Robert Millan
+      <rmh at aybabtu.com>. This patch prevents that projects are reset when the
+      platform name in client_state.xml does not match the platform name the
+      client was compiled for and it also sets the platform name from
+      client_state.xml as the valid platform name which will be used for
+      scheduler requests. This patch only affects AMD64. (related to: #366741)
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sat, 26 Aug 2006 14:39:01 +0200
 
 boinc (5.4.10-2) unstable; urgency=medium
 

Modified: trunk/boinc/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/00list?rev=511&op=diff
==============================================================================
--- trunk/boinc/debian/patches/00list (original)
+++ trunk/boinc/debian/patches/00list Sat Aug 26 12:40:54 2006
@@ -1,2 +1,3 @@
+01_amd64-disable-platform-reset.dpatch
 07_use-sensible-browser.dpatch
 10_exclude-sea.dpatch

Added: 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=511&op=file
==============================================================================
--- trunk/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch (added)
+++ trunk/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch Sat Aug 26 12:40:54 2006
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_amd64-disable-platform-reset.dpatch by Robert Millan <rmh at aybabtu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: See these mailing lists post for a description of this patch:
+## DP: http://lists.alioth.debian.org/pipermail/pkg-boinc-devel/2006-August/000352.html
+## DP: http://lists.alioth.debian.org/pipermail/pkg-boinc-devel/2006-August/000350.html
+
+ at 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 @@
+     // This could happen e.g. if user copies files from PPC to Intel Mac
+     //
+     if (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 @@
+             p = projects[i];
+             reset_project(p);
+         }
++#endif
+     }
+ 
+     return 0;

Propchange: trunk/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch
------------------------------------------------------------------------------
    svn:executable = *