Add non-free-firmware to the valid sections

[bugscan.git] / bugcfg.pm

diff --git a/bugcfg.pm b/bugcfg.pm
index b1f420caef65b20eaa0563ab4609aaafc699e527..efa475b875e82bc7b2dee9862578c79d08238c65 100644 (file)
--- a/bugcfg.pm
+++ b/bugcfg.pm
@@ -12,18 +12,29 @@ use Debbugs::Config qw(:config);
 
 $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" );
-our @sections          = ( "main", "contrib", "non-free" );
+# this is just the default, and should always be overriden by the
+# Debbugs::Config; set values
+our $debian_releases = {testing => 'stretch',
+                        stable  => 'jessie',
+                        unstable => 'sid',
+                        oldstable => 'wheezy',
+                       };
+# 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/testing/arch_qualify.html
+# and then generally include architectures which are currently in testing
+our @architectures = qw(all amd64 arm64 armel armhf i386 ppc64el s390x);
+our @sections          = ( "main", "contrib", "non-free", "non-free-firmware" );
 our @priorities                = @{$config{strong_severities}};
 our @skiptags          = ( );