[Pkg-dspam-commits] [pkg-dspam-commits] r233 - branches/experimental/debian/patches

[Julien Valroff]

Author: julien-guest
Date: Sun Jan  3 19:38:49 2010
New Revision: 233

Log:
Fixed path to ttf in configure.pl patch

Modified:
   branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff

Modified: branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff
==============================================================================
--- branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff	Sun Jan  3 19:38:29 2010	(r232)
+++ branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff	Sun Jan  3 19:38:49 2010	(r233)
@@ -86,7 +86,7 @@
  }
  
 -GD::Graph::colour::read_rgb("rgb.txt"); 
-+GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt"); 
++GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt");
  
  do {
    my($spam, $nonspam, $sm, $fp, $inoc, $wh, $corpus, $virus, $black, $block, $period) = split(/\_/, $FORM{'data'});
@@ -106,7 +106,7 @@
  
  # Default DSPAM display
  #$CONFIG{'DATE_FORMAT'}	= "%d.%m.%Y %H:%M"; # Date format in strftime style
-@@ -46,10 +46,11 @@
+@@ -46,13 +46,15 @@
  $CONFIG{'MAX_COL_LEN'}	= 50;		# Max chars in list columns
  $CONFIG{'SORT_DEFAULT'}	= "Rating";	# Show quarantine by "Date" or "Rating"
  $CONFIG{'3D_GRAPHS'}	= 1;		# 0=graphs in 2D, 1=graphs in 3D
@@ -115,10 +115,17 @@
  
  # Full path to TTF font(s) used for legend, x and y labels in Graphs. GD must be compiled
  # with TTF support if you want to use this feature.
+-#$CONFIG{'GRAPHS_X_LABEL_FONT'} = "/usr/share/fonts/dejavu/DejaVuSans.ttf";
+-#$CONFIG{'GRAPHS_Y_LABEL_FONT'} = "/usr/share/fonts/dejavu/DejaVuSans.ttf";
+-#$CONFIG{'GRAPHS_LEGEND_FONT'}  = "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf";
 +# On Debian, you need to install libgd-gd2-perl rather than libgd-gd2-noxpm-perl
- #$CONFIG{'GRAPHS_X_LABEL_FONT'} = "/usr/share/fonts/dejavu/DejaVuSans.ttf";
- #$CONFIG{'GRAPHS_Y_LABEL_FONT'} = "/usr/share/fonts/dejavu/DejaVuSans.ttf";
- #$CONFIG{'GRAPHS_LEGEND_FONT'}  = "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf";
++# You will also need some ttf font (eg. DejaVu in the ttf-dejavu-core package)
++#$CONFIG{'GRAPHS_X_LABEL_FONT'} = "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf";
++#$CONFIG{'GRAPHS_Y_LABEL_FONT'} = "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf";
++#$CONFIG{'GRAPHS_LEGEND_FONT'}  = "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf";
+ 
+ # Add customized settings below
+ $CONFIG{'LOCAL_DOMAIN'}	= "yourdomain.com";
 --- a/webui/cgi-bin/dspam.cgi
 +++ b/webui/cgi-bin/dspam.cgi
 @@ -28,14 +28,14 @@
@@ -203,7 +210,7 @@
  }
  
 -GD::Graph::colour::read_rgb("rgb.txt"); 
-+GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt"); 
++GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt");
  
  do {
    my($spam, $nonspam, $period) = split(/\_/, $FORM{'data'});