merge changes from dla bugscan tree

diff --cc bugcfg.pm
index d6ad3a83a481dfc692810f50ba2baa2e49a5252b,f3f5af4cf006c16204bc7fc1d92c1a9dd9880fce..e6899a5f119c3b4a6fdbe1da8aa513d3240e3e06
--- 1/bugcfg.pm
--- 2/bugcfg.pm
+++ b/bugcfg.pm
@@@ -6,30 -6,23 +6,24 @@@ use warnings
  package bugcfg;
  our ($spooldir,$maintainerlist,$debian_ftproot,$debian_sources,$pseudolist);
  
+ use Debbugs::Config qw(:config);
+ 
  # General configuration stuff
  
- my $host=`hostname`;
- chomp $host;
- if ($host eq "master" or $host eq "spohr" or $host eq "rietz" or $host eq "busoni") {
-       $spooldir       = "/org/bugs.debian.org/debbugs/spool/db-h";
-       $maintainerlist = "/etc/debbugs/Maintainers";
-       $debian_ftproot = "/org/bugs.debian.org/etc/indices/ftp/testing";
-       $debian_sources = "/etc/debbugs/indices/ftp.sources";
-       $pseudolist     = "/org/bugs.debian.org/etc/pseudo-packages.description";
- } elsif ($host eq "merkel") {
-       $spooldir       = "/org/bugs.debian.org/spool/db-h";
-       $maintainerlist = "/etc/debbugs/Maintainers";
-       $debian_ftproot = "/org/bugs.debian.org/etc/indices/ftp/testing";
-       $debian_sources = "/etc/debbugs/indices/ftp.sources";
-       $pseudolist     = "/org/bugs.debian.org/etc/pseudo-packages.description";
- } else {
-       die "Unknown machine, please configure paths in bugcfg.pm\n";
- }
+ $spooldir = $config{spool_dir};
+ $maintainerlist = $config{maintainer_file};
+ $debian_ftproot = $config{package_source}
+ $debian_sources = $config{package_source};
+ $pseudolist = $config{pseudo_desc_file};
+ 
+ $debian_sources       = "/etc/debbugs/indices/ftp.sources";
+ 
+ 
  
 -our @architectures            = ( "i386", "amd64", "alpha", "sparc", "powerpc", "armel", "hppa", "ia64", "mips", "mipsel", "s390" );
 +# alpha excluded to RM request
 +our @architectures            = ( "i386", "amd64", "sparc", "powerpc", "armel", "hppa", "ia64", "mips", "mipsel", "s390" );
  our @sections         = ( "main", "contrib", "non-free" );
- our @priorities               = ( "serious", "grave", "critical" );
+ our @priorities               = $config{strong_severities};
  our @skiptags         = ( );
  
  1;

diff --cc bugreport
Simple merge