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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit e58f95839c5cbe33a5122ac353804f32c6638573
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jul 24 22:36:49 2011 +0200

    New version and first round on stripchart.

diff --git a/debian/boinc-cgi-stripchart.README.Debian b/debian/boinc-cgi-stripchart.README.Debian
new file mode 100644
index 0000000..8c3870c
--- /dev/null
+++ b/debian/boinc-cgi-stripchart.README.Debian
@@ -0,0 +1,4 @@
+boinc-cgi-stripchart
+====================
+
+This package is still very much experimental. Please help.
diff --git a/debian/boinc-cgi-stripchart.dirs b/debian/boinc-cgi-stripchart.dirs
index ae38efd..62e4c81 100644
--- a/debian/boinc-cgi-stripchart.dirs
+++ b/debian/boinc-cgi-stripchart.dirs
@@ -1 +1,2 @@
 usr/lib/cgi-bin
+usr/share/stripchart
diff --git a/debian/boinc-cgi-stripchart.install b/debian/boinc-cgi-stripchart.install
index b73da48..6a2471a 100644
--- a/debian/boinc-cgi-stripchart.install
+++ b/debian/boinc-cgi-stripchart.install
@@ -1,3 +1,4 @@
 stripchart/stripchart		usr/lib/cgi-bin
+stripchart/samples/datafiles	usr/share/stripchart
 stripchart/stripchart.cgi	usr/lib/cgi-bin
-stripchart/stripchart.cnf	usr/lib/cgi-bin
+stripchart/stripchart.cnf	etc
diff --git a/debian/changelog b/debian/changelog
index 3e38998..d992cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (6.13.1+dfsg-1) experimental; urgency=low
+
+  * New upstream version
+  * Added boinc-cgi-stripchart package
+
+ -- Steffen Moeller <moeller at debian.org>  Sun, 24 Jul 2011 22:20:04 +0200
+
 boinc (6.12.33+dfsg-1) unstable; urgency=low
 
   [Steffen]
diff --git a/debian/patches/stripchart_debian.patch b/debian/patches/stripchart_debian.patch
index cde83f1..f0a7a88 100644
--- a/debian/patches/stripchart_debian.patch
+++ b/debian/patches/stripchart_debian.patch
@@ -1,7 +1,7 @@
 Index: boinc/stripchart/stripchart.cnf
 ===================================================================
---- boinc.orig/stripchart/stripchart.cnf	2011-07-24 20:08:48.000000000 +0200
-+++ boinc/stripchart/stripchart.cnf	2011-07-24 20:11:18.000000000 +0200
+--- boinc.orig/stripchart/stripchart.cnf	2011-07-24 22:21:26.000000000 +0200
++++ boinc/stripchart/stripchart.cnf	2011-07-24 22:33:51.000000000 +0200
 @@ -8,7 +8,7 @@
  # Directory where gnuplot is
  # $gnuplot = "/usr/local/gnuplot-3.7";
@@ -11,9 +11,21 @@ Index: boinc/stripchart/stripchart.cnf
   
  # Temporary files
  $suffix = rand(10000);
-@@ -54,9 +54,9 @@
+@@ -42,7 +42,7 @@
+ $tzdiff = timegm($sec,$min,$hour,$mday,$mon,$year) - timelocal($sec,$min,$hour,$mday,$mon,$year);
+ 
+ # Where is the stripchart executable located?
+-$stripchartexe = "./stripchart"
++$stripchartexe = "/usr/lib/cgi-bin/stripchart"
+  
+ # What is the default number of stripcharts?
+ $defaultnumcharts = 1;
+@@ -52,11 +52,11 @@
+ 
+ # Where is the list of datafiles for stripchart.cgi?
  # Note: there is a sample copy in the samples directory: 
- $datafilelist = "datafiles";
+-$datafilelist = "datafiles";
++$datafilelist = "/usr/share/stripchart/datafiles";
   
 -# Where is the list of user-definied cgi queries?
 +# Where is the list of user-defined cgi queries?
@@ -23,3 +35,41 @@ Index: boinc/stripchart/stripchart.cnf
  
  # What time is it right now?
  $rightnow = time;
+Index: boinc/stripchart/stripchart
+===================================================================
+--- boinc.orig/stripchart/stripchart	2011-07-24 22:21:41.000000000 +0200
++++ boinc/stripchart/stripchart	2011-07-24 22:23:31.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ 
+ # The contents of this file are subject to the Mozilla Public License
+ # Version 1.0 (the "License"); you may not use this file except in
+@@ -47,7 +47,7 @@
+ ################
+ 
+ # Where is the .cnf file?
+-$cnfpath = "./stripchart.cnf";
++$cnfpath = "/etc/stripchart.cnf";
+ 
+ # Read it in:
+ open (CNFFILE,$cnfpath) or die "cannot open configuration file: $cnfpath\nmake sure this variable is set properly";
+Index: boinc/stripchart/stripchart.cgi
+===================================================================
+--- boinc.orig/stripchart/stripchart.cgi	2011-07-24 22:26:25.000000000 +0200
++++ boinc/stripchart/stripchart.cgi	2011-07-24 22:27:14.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env perl
++#!/usr/bin/perl
+ 
+ # The contents of this file are subject to the Mozilla Public License
+ # Version 1.0 (the "License"); you may not use this file except in
+@@ -44,7 +44,7 @@
+ ################
+  
+ # Where is the .cnf file? 
+-$cnfpath = "./stripchart.cnf";
++$cnfpath = "/etc/stripchart.cnf";
+ 
+ # Read it in: 
+ open (CNFFILE,$cnfpath) or die "cannot open configuration file: $cnfpath\nmake sure this variable is set properly"; 

-- 
BOINC packaging