X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugcfg.pm;h=7d0469d05c8bf4c91cffa18ab853b49f3813457a;hp=fd34c67f0a75925298aa6eadfa2f5f87be13b015;hb=ed0c4f5a2a8db51bd58d3b03381163c1ffa164fd;hpb=92f19a96ce2b54287b90bbbe625b6c0d7a1ece63

diff --git a/bugcfg.pm b/bugcfg.pm
index fd34c67..7d0469d 100644
--- a/bugcfg.pm
+++ b/bugcfg.pm
@@ -10,21 +10,32 @@ use Debbugs::Config qw(:config);
 
 # General configuration stuff
 
-$spooldir = $config{spool_dir};
+$spooldir = $config{spool_dir}.'/db-h';
 $maintainerlist = $config{maintainer_file};
-$debian_ftproot = $config{package_source};
-$debian_sources = $config{package_source};
+$debian_sources = "/etc/debbugs/indices/ftp.sources";
+$debian_ftproot = "/srv/bugs.debian.org/etc/indices/ftp/testing";
 $pseudolist = $config{pseudo_desc_file};
 
-$debian_sources	= "/etc/debbugs/indices/ftp.sources";
-
-$debian_ftproot = "/org/bugs.debian.org/etc/indices/ftp/testing";
-
-
-# alpha excluded to RM request
-our @architectures		= ( "i386", "amd64", "sparc", "powerpc", "armel", "hppa", "ia64", "mips", "mipsel", "s390" );
+# this is just the default, and should always be overriden by the
+# Debbugs::Config; set values
+our $debian_releases = {testing => 'jessie',
+                        stable  => 'wheezy',
+                        unstable => 'sid',
+                        oldstable => 'squeeze',
+                       };
+# figure out debian releases from distribution aliases
+for my $alias (keys %{$config{distribution_aliases}//{}}) {
+    next if $alias eq $config{distribution_aliases}{$alias};
+    $debian_releases->{$config{distribution_aliases}{$alias}} =
+        $alias;
+}
+
+# check out:
+# http://release.debian.org/wheezy/arch_qualify.html
+# and then generally include architectures which are currently in testing
+our @architectures = qw(amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc);
 our @sections		= ( "main", "contrib", "non-free" );
-our @priorities		= $config{strong_severities};
+our @priorities		= @{$config{strong_severities}};
 our @skiptags		= ( );
 
 1;