[SCM] Debian package checker branch, master, updated. 2.5.11-29-gce7bbee

["Jordà Polo" <jorda@ettin.org>]

The following commit has been merged in the master branch:
commit ce7bbeeca94a57509136ae1a001c30f1ebe0f12c
Author: Jordà Polo <jorda@ettin.org>
Date:   Sat Dec 29 22:56:22 2012 +0100

    Remove unused $GRAPH_DIR configuration option
    
    * reporting/config:
      + [JP] Remove unused $GRAPH_DIR configuration option.

diff --git a/debian/changelog b/debian/changelog
index 595b48d..9ac7472 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ lintian (2.5.12) UNRELEASED; urgency=low
     + [NT] Add and export "versions_comparator" that can be used for
       sorting purposes.
 
+  * reporting/config:
+    + [JP] Remove unused $GRAPH_DIR configuration option.
   * reporting/graphs/{statistics,tags}.gpi:
     + [JP] Tweak graph size to allow longer labels, and force font
       family.
diff --git a/reporting/config b/reporting/config
index 9cc192b..197c031 100644
--- a/reporting/config
+++ b/reporting/config
@@ -13,7 +13,6 @@ $LINTIAN_LAB = "$HOME/laboratory";
 $LOG_DIR = "$HOME/logs";
 $HTML_DIR = "$HOME/www";
 $HTML_TMP_DIR = "$HTML_DIR.new";
-$GRAPH_DIR = "$HTML_TMP_DIR/graphs";
 $LINTIAN_CFG = "$LINTIAN_ROOT/reporting/lintian-dummy.cfg";  # this config file has to be empty!
 $LINTIAN_BIN_DIR = "$HOME/bin";
 $LINTIAN_GPG_CHECK = 0;
diff --git a/reporting/html_reports b/reporting/html_reports
index a5eb229..719131d 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -37,7 +37,7 @@ use Text::Template ();
 our ($LINTIAN_ROOT, $LINTIAN_LAB, $LINTIAN_ARCHIVEDIR, $LINTIAN_DIST,
      $LINTIAN_ARCH, $HTML_TMP_DIR, $statistics_file,
      $LINTIAN_AREA, $HISTORY, $HISTORY_DIR, $LINTIAN_SOURCE,
-     $GRAPHS_RANGE_DAYS, $GRAPHS, $GRAPH_DIR, $LINTIAN_MIRROR_NAME);
+     $GRAPHS_RANGE_DAYS, $GRAPHS, $LINTIAN_MIRROR_NAME);
 
 # Read the configuration.
 require './config';
@@ -585,8 +585,8 @@ exit 0 if (not $HISTORY);
 
 # Update history.
 my %versions = ();
-my $commonf = "$GRAPH_DIR/common.gpi";
-my $do_graphs = 1;
+my $graph_dir = "$HTML_TMP_DIR/graphs";
+my $commonf = "$graph_dir/common.gpi";
 my $unix_time = time();
 mkdir("$HISTORY_DIR")
     or die "cannot create history directory $HISTORY_DIR: $!\n"
@@ -615,10 +615,10 @@ if ($GRAPHS and seek HIST, 0, SEEK_SET) {
 close HIST or die "cannot write to $history_file: $!\n";
 
 if ($GRAPHS) {
-    mkdir("$GRAPH_DIR", 0777)
-        or die "cannot create output directory $GRAPH_DIR: $!\n";
-    mkdir("$GRAPH_DIR/tags", 0777)
-        or die "cannot create output directory $GRAPH_DIR/tags: $!\n";
+    mkdir("$graph_dir", 0777)
+        or die "cannot create output directory $graph_dir: $!\n";
+    mkdir("$graph_dir/tags", 0777)
+        or die "cannot create output directory $graph_dir/tags: $!\n";
 
     my $date_min = strftime ("%s", localtime ($unix_time - 3600 * 24 * $GRAPHS_RANGE_DAYS));
     my $date_max = strftime ("%s", localtime ($unix_time));
@@ -628,7 +628,7 @@ if ($GRAPHS) {
     open my $common, '>', $commonf
         or die "cannot open $commonf: $!\n";
     print { $common } "history_dir='$HISTORY_DIR'\n";
-    print { $common } "graph_dir='$GRAPH_DIR'\n";
+    print { $common } "graph_dir='$graph_dir'\n";
     print { $common } "date_min='$date_min'\n";
     print { $common } "date_max='$date_max'\n";
     my $last_version = 0;
@@ -652,7 +652,7 @@ if ($GRAPHS) {
     close $common or die "close $commonf: $!\n";
 
     print "Plotting global statistics...\n";
-    chdir_system ($GRAPH_DIR, ['gnuplot', "$LINTIAN_ROOT/reporting/graphs/statistics.gpi"]) == 0
+    chdir_system ($graph_dir, ['gnuplot', "$LINTIAN_ROOT/reporting/graphs/statistics.gpi"]) == 0
         or die "gnuplot died with $?\n";
 }
 
@@ -666,7 +666,7 @@ for my $tag (sort keys %tag_statistics) {
     close HIST or die "cannot write to $history_file: $!\n";
     if ($GRAPHS) {
         print "Plotting $tag statistics...\n";
-        chdir_system ($GRAPH_DIR, ['gnuplot', '-e', "tag='$tag'",
+        chdir_system ($graph_dir, ['gnuplot', '-e', "tag='$tag'",
                                    "$LINTIAN_ROOT/reporting/graphs/tags.gpi"]) == 0
             or die "gnuplot died with $?\n";
     }

-- 
Debian package checker