Commit to mainline by don@debian.org -- merge changes from dla source tree

[Debbugs Maintainers]

------------------------------------------------------------
revno: 878
committer: Debian BTS <debb...@rietz>
branch nick: mainline
timestamp: Sat 2008-12-13 18:09:57 +0000
message:
  merge changes from dla source tree
    ------------------------------------------------------------
    revno: 738.3.37
    committer: Don Armstrong <d...@donarmstrong.com>
    branch nick: source
    timestamp: Sat 2008-12-13 12:03:57 -0600
    message:
      add missing @gAffectsDistributionTags; map the distribution tags 
appropriately
    ------------------------------------------------------------
    revno: 738.3.36
    committer: Don Armstrong <d...@donarmstrong.com>
    branch nick: source
    timestamp: Sat 2008-12-13 02:08:45 -0800
    message:
       * Remove newline from default machine name
       * Add semicolon between date and machine name; ditch extra newlines

=== modified file 'Debbugs/Config.pm'
--- Debbugs/Config.pm   2008-12-04 03:53:28 +0000
+++ Debbugs/Config.pm   2008-12-13 18:09:41 +0000
@@ -67,6 +67,7 @@
                                 qw(%gObsoleteSeverities),
                                 qw(@gPostProcessall 
@gRemovalDefaultDistributionTags @gRemovalDistributionTags 
@gRemovalArchitectures),
                                 
qw(@gRemovalStrongSeverityDefaultDistributionTags),
+                                qw(@gAffectsDistributionTags),
                                 qw(@gDefaultArchitectures),
                                 qw($gMachineName),
                                 qw($gTemplateDir),
@@ -290,7 +291,9 @@
 
 my $_old_path = $ENV{PATH};
 $ENV{PATH} = '/bin:/usr/bin:/usr/local/bin';
-set_default(\%config,'machine_name',qx(hostname --fqdn));
+my $temp_hostname = qx(hostname --fqdn);
+chomp $temp_hostname;
+set_default(\%config,'machine_name',$temp_hostname);
 $ENV{PATH} = $_old_path;
 
 =head2 BTS Mailing Lists

=== modified file 'Debbugs/Status.pm'
--- Debbugs/Status.pm   2008-09-18 03:13:16 +0000
+++ Debbugs/Status.pm   2008-12-13 18:09:41 +0000
@@ -1076,10 +1076,15 @@
               my $some_distributions_disallowed = 0;
               my %allowed_distributions;
               for my $tag (split ' ', ($status{tags}||'')) {
-                   if (exists $affects_distribution_tags{$tag}) {
-                        $some_distributions_disallowed = 1;
-                        $allowed_distributions{$tag} = 1;
-                   }
+                  if (exists $config{distribution_aliases}{$tag} and
+                       exists 
$affects_distribution_tags{$config{distribution_aliases}{$tag}}) {
+                      $some_distributions_disallowed = 1;
+                      
$allowed_distributions{$config{distribution_aliases}{$tag}} = 1;
+                  }
+                  elsif (exists $affects_distribution_tags{$tag}) {
+                      $some_distributions_disallowed = 1;
+                      $allowed_distributions{$tag} = 1;
+                  }
               }
               foreach my $arch (make_list($param{arch})) {
                    for my $package (split /\s*,\s*/, $status{package}) {

=== modified file 'templates/en_US/html/html_tail.tmpl'
--- templates/en_US/html/html_tail.tmpl 2008-12-03 19:09:06 +0000
+++ templates/en_US/html/html_tail.tmpl 2008-12-13 18:09:41 +0000
@@ -1,12 +1,8 @@
 <ADDRESS>{$config{maintainer}} &lt;<A 
HREF="mailto:{$config{maintainer_email}}";>{$config{maintainer_email}}</A>&gt;.
 Last modified:
-<!--timestamp-->
-{$last_modified||strftime('%c',gmtime)}
-<!--timestamp-->
+<!--timestamp-->{$last_modified||strftime('%c',gmtime)}<!--end timestamp-->; 
 Machine Name:
-<!--machinename-->
-{$config{machine_name}||'Unknown'}
-<!--machinename-->
+<!--machinename-->{$config{machine_name}||'Unknown'}<!--machinename-->
 <P>
 <A HREF="http://{$config{web_domain}}/";>{$config{project}} {$config{bug}} 
tracking system</A><BR>
 Copyright (C) 1999 Darren O. Benham,