5 files changed, 32 insertions, 64 deletions
diff --git a/debian/patches/001_path-to-rrd.diff b/debian/patches/001_path-to-rrd.diff
new file mode 100644
index 0000000..442ea58
--- /dev/null
+++ b/debian/patches/001_path-to-rrd.diff
@@ -0,0 +1,31 @@
+Description: Set path to rrd files to /var/lib/mailgraph/
+Forwarded: not-needed
+
+--- a/mailgraph.cgi
++++ b/mailgraph.cgi
+@@ -16,9 +16,9 @@
+ my $points_per_sample = 3;
+ my $ypoints = 160;
+ my $ypoints_err = 96;
+-my $rrd = 'mailgraph.rrd'; # path to where the RRD database is
+-my $rrd_virus = 'mailgraph_virus.rrd'; # path to where the Virus RRD database is
+-my $tmp_dir = '/tmp/mailgraph'; # temporary directory where to store the images
++my $rrd = '/var/lib/mailgraph/mailgraph.rrd'; # path to where the RRD database is
++my $rrd_virus = '/var/lib/mailgraph/mailgraph_virus.rrd'; # path to where the Virus RRD database is
++my $tmp_dir = '/var/lib/mailgraph/'; # temporary directory where to store the images
+ 
+ my @graphs = (
+ 	{ title => 'Last Day',   seconds => 3600*24,        },
+--- a/mailgraph.pl
++++ b/mailgraph.pl
+@@ -377,8 +377,8 @@
+ 
+ # global variables
+ my $logfile;
+-my $rrd = "mailgraph.rrd";
+-my $rrd_virus = "mailgraph_virus.rrd";
++my $rrd = "/var/lib/mailgraph/mailgraph.rrd";
++my $rrd_virus = "/var/lib/mailgraph/mailgraph_virus.rrd";
+ my $year;
+ my $this_minute;
+ my %sum = ( sent => 0, received => 0, bounced => 0, rejected => 0, virus => 0, spam => 0 );
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 90c588f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-101_mailgraph.pl.diff
-102_mailgraph.cgi.diff
diff --git a/debian/patches/101_mailgraph.pl.diff b/debian/patches/101_mailgraph.pl.diff
deleted file mode 100644
index bbfff29..0000000
--- a/debian/patches/101_mailgraph.pl.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then 
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1  
-fi
-case "$1" in 
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -Nur mailgraph-1.10.orig/mailgraph.pl mailgraph-1.10/mailgraph.pl
---- mailgraph-1.10.orig/mailgraph.pl	2004-10-25 19:27:09.000000000 +0000
-+++ mailgraph-1.10/mailgraph.pl	2004-11-27 17:51:41.000000000 +0000
-@@ -304,8 +304,8 @@
- 
- # global variables
- my $logfile;
--my $rrd = "mailgraph.rrd";
--my $rrd_virus = "mailgraph_virus.rrd";
-+my $rrd = "/var/lib/mailgraph/mailgraph.rrd";
-+my $rrd_virus = "/var/lib/mailgraph/mailgraph_virus.rrd";
- my $year;
- my $this_minute;
- my %sum = ( sent => 0, received => 0, bounced => 0, rejected => 0, virus => 0, spam => 0 );
diff --git a/debian/patches/102_mailgraph.cgi.diff b/debian/patches/102_mailgraph.cgi.diff
deleted file mode 100644
index 4409c58..0000000
--- a/debian/patches/102_mailgraph.cgi.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then 
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1  
-fi
-case "$1" in 
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -Nur mailgraph-1.12.orig/mailgraph.cgi mailgraph-1.12/mailgraph.cgi
---- mailgraph-1.12.orig/mailgraph.cgi	2005-10-16 19:17:00.000000000 +0200
-+++ mailgraph-1.12/mailgraph.cgi	2005-11-13 13:43:32.000000000 +0100
-@@ -15,9 +15,9 @@
- my $points_per_sample = 3;
- my $ypoints = 160;
- my $ypoints_err = 96;
--my $rrd = 'mailgraph.rrd'; # path to where the RRD database is
--my $rrd_virus = 'mailgraph_virus.rrd'; # path to where the Virus RRD database is
--my $tmp_dir = '/tmp/mailgraph'; # temporary directory where to store the images
-+my $rrd = '/var/lib/mailgraph/mailgraph.rrd'; # path to where the RRD database is
-+my $rrd_virus = '/var/lib/mailgraph/mailgraph_virus.rrd'; # path to where the Virus RRD database is
-+my $tmp_dir = '/var/lib/mailgraph'; # temporary directory where to store the images
- 
- my @graphs = (
- 	{ title => 'Day Graphs',   seconds => 3600*24,        },
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..24900d0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001_path-to-rrd.diff