[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-372-ga2a0fc3

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 2e4e2de9d971bf37d82293ce68ccd651b6eade9c
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Jan 21 22:02:00 2012 +0100

    Upload 7.0.8-2

diff --git a/debian/changelog b/debian/changelog
index 24d3007..caaf3dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.0.8+dfsg-2) unstable; urgency=low
+
+  * Fixed patch for whitespace removal.
+
+ -- Steffen Moeller <moeller at debian.org>  Mon, 16 Jan 2012 23:00:02 +0100
+
 boinc (7.0.8+dfsg-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/patches/bad_tag.patch b/debian/patches/bad_tag.patch
index 0a32f56..fa020e0 100644
--- a/debian/patches/bad_tag.patch
+++ b/debian/patches/bad_tag.patch
@@ -1,7 +1,7 @@
 Index: boinc/lib/gui_rpc_client_ops.cpp
 ===================================================================
---- boinc.orig/lib/gui_rpc_client_ops.cpp	2012-01-14 23:16:05.000000000 +0100
-+++ boinc/lib/gui_rpc_client_ops.cpp	2012-01-15 00:56:00.000000000 +0100
+--- boinc.orig/lib/gui_rpc_client_ops.cpp	2012-01-15 01:31:59.000000000 +0100
++++ boinc/lib/gui_rpc_client_ops.cpp	2012-01-15 01:45:07.000000000 +0100
 @@ -1871,19 +1871,19 @@
  
      retval = rpc.do_rpc(buf);
@@ -30,8 +30,8 @@ Index: boinc/lib/gui_rpc_client_ops.cpp
      return retval;
 Index: boinc/lib/parse.cpp
 ===================================================================
---- boinc.orig/lib/parse.cpp	2012-01-14 23:16:05.000000000 +0100
-+++ boinc/lib/parse.cpp	2012-01-15 00:51:23.000000000 +0100
+--- boinc.orig/lib/parse.cpp	2012-01-15 01:31:59.000000000 +0100
++++ boinc/lib/parse.cpp	2012-01-15 01:45:07.000000000 +0100
 @@ -90,7 +90,6 @@
  // Use "<tag", not "<tag>", if there might be attributes
  //
@@ -42,21 +42,21 @@ Index: boinc/lib/parse.cpp
  
 Index: boinc/lib/str_util.cpp
 ===================================================================
---- boinc.orig/lib/str_util.cpp	2012-01-14 23:16:05.000000000 +0100
-+++ boinc/lib/str_util.cpp	2012-01-15 00:51:23.000000000 +0100
-@@ -312,37 +312,40 @@
+--- boinc.orig/lib/str_util.cpp	2012-01-15 01:31:59.000000000 +0100
++++ boinc/lib/str_util.cpp	2012-01-16 22:47:39.000000000 +0100
+@@ -312,37 +312,39 @@
  // remove whitespace from start and end of a string
  //
  void strip_whitespace(char *str) {
 -    int n;
-+
-+    char *s=str;
-     while (1) {
+-    while (1) {
 -        if (!str[0]) break;
 -        if (!isascii(str[0])) break;
 -        if (!isspace(str[0])) break;
 -        strcpy_overlap(str, str+1);
-+        if (! *s) break;
++
++    char *s=str;
++    while (*s) {
 +        if (!isascii(*s)) break;
 +        if (!isspace(*s)) break;
 +	s++;
@@ -89,15 +89,13 @@ Index: boinc/lib/str_util.cpp
 -    while (1) {
 -        n = (int)str.length();
 -        if (n == 0) break;
--        if (!isascii(str[n-1])) break;
--        if (!isspace(str[n-1])) break;
--        str.erase(n-1, 1);
 +
 +    int n = (int) str.length();
 +    while (n>0) {
+         if (!isascii(str[n-1])) break;
+         if (!isspace(str[n-1])) break;
+-        str.erase(n-1, 1);
 +	n--;
-+        if (!isascii(str[n])) break;
-+        if (!isspace(str[n])) break;
      }
 +    str.erase(n, str.length()-n);
  }
diff --git a/debian/patches/series b/debian/patches/series
index 5f829ec..77506a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ stripchart_security.patch
 #AddingMoreConst.patch
 #evenMoreConst03.patch
 #andYetMorePatches04.patch
+#erase_while_1.patch
diff --git a/debian/patches/stripchart_security.patch b/debian/patches/stripchart_security.patch
index 34f5162..b1845c7 100644
--- a/debian/patches/stripchart_security.patch
+++ b/debian/patches/stripchart_security.patch
@@ -1,7 +1,7 @@
 Index: boinc/stripchart/samples/get_load
 ===================================================================
---- boinc.orig/stripchart/samples/get_load	2011-09-10 17:52:40.000000000 +0200
-+++ boinc/stripchart/samples/get_load	2011-09-11 11:20:51.000000000 +0200
+--- boinc.orig/stripchart/samples/get_load	2012-01-15 01:31:59.000000000 +0100
++++ boinc/stripchart/samples/get_load	2012-01-15 02:02:05.000000000 +0100
 @@ -1,11 +1,11 @@
 -#! /bin/csh 
 +#!/bin/sh 
@@ -23,8 +23,8 @@ Index: boinc/stripchart/samples/get_load
  echo $CIVDATE $UNIXDATE $UPTIME
 Index: boinc/stripchart/samples/parse_config
 ===================================================================
---- boinc.orig/stripchart/samples/parse_config	2011-09-10 17:52:41.000000000 +0200
-+++ boinc/stripchart/samples/parse_config	2011-09-11 11:20:51.000000000 +0200
+--- boinc.orig/stripchart/samples/parse_config	2012-01-15 01:31:59.000000000 +0100
++++ boinc/stripchart/samples/parse_config	2012-01-15 02:02:05.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
@@ -33,8 +33,8 @@ Index: boinc/stripchart/samples/parse_config
  
 Index: boinc/stripchart/samples/dir_size
 ===================================================================
---- boinc.orig/stripchart/samples/dir_size	2011-09-10 17:52:41.000000000 +0200
-+++ boinc/stripchart/samples/dir_size	2011-09-11 11:20:51.000000000 +0200
+--- boinc.orig/stripchart/samples/dir_size	2012-01-15 01:31:59.000000000 +0100
++++ boinc/stripchart/samples/dir_size	2012-01-15 02:02:05.000000000 +0100
 @@ -1,8 +1,8 @@
 -#! /bin/csh 
 +#!/bin/sh 
@@ -50,8 +50,8 @@ Index: boinc/stripchart/samples/dir_size
  echo $CIVDATE $UNIXDATE $SIZE
 Index: boinc/stripchart/stripchart.cnf
 ===================================================================
---- boinc.orig/stripchart/stripchart.cnf	2011-09-11 11:59:01.000000000 +0200
-+++ boinc/stripchart/stripchart.cnf	2011-09-11 11:59:57.000000000 +0200
+--- boinc.orig/stripchart/stripchart.cnf	2012-01-15 02:02:04.000000000 +0100
++++ boinc/stripchart/stripchart.cnf	2012-01-15 02:02:05.000000000 +0100
 @@ -1,4 +1,5 @@
 -#! /usr/bin/env perl
 +

-- 
BOINC packaging