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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit d19245125476099c335a52902a5346475c5ddccf
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Sep 11 12:00:24 2011 +0200

    Adjusted stripchart shebang line

diff --git a/debian/patches/stripchart_security.patch b/debian/patches/stripchart_security.patch
index 0a596e1..34f5162 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:39:14.000000000 +0200
-+++ boinc/stripchart/samples/get_load	2011-09-10 17:40:12.000000000 +0200
+--- 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
 @@ -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:39:14.000000000 +0200
-+++ boinc/stripchart/samples/parse_config	2011-09-10 17:40:12.000000000 +0200
+--- 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
 @@ -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:40:20.000000000 +0200
-+++ boinc/stripchart/samples/dir_size	2011-09-10 17:45:45.000000000 +0200
+--- 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
 @@ -1,8 +1,8 @@
 -#! /bin/csh 
 +#!/bin/sh 
@@ -48,3 +48,23 @@ Index: boinc/stripchart/samples/dir_size
 +UNIXDATE=`perl -e 'print time()'`
  
  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
+@@ -1,4 +1,5 @@
+-#! /usr/bin/env perl
++
++# This should not be executed, but merely be included
+ 
+ use Time::Local;
+ 
+@@ -6,8 +7,6 @@
+ $majorversion = 2; $minorversion = 1;
+ 
+ # Directory where gnuplot is
+-# $gnuplot = "/usr/local/gnuplot-3.7";
+-#$gnuplot = "/disks/asimov/a/users/hiramc/local/src/gnuplot-3.7";
+ $gnuplot = "/usr/bin"
+  
+ # Temporary files

-- 
BOINC packaging