Move the counts around a bit.

[bugscan.git] / bugcfg.pm

diff --git a/bugcfg.pm b/bugcfg.pm
index d4f700d602ac2590c57c8e275e1ff069b8a8714a..c53a9f5dc7323b0a7a795ae49384094f1e2a932a 100644 (file)
--- a/bugcfg.pm
+++ b/bugcfg.pm
@@ -4,8 +4,7 @@
 use strict;
 use warnings;
 package bugcfg;
-our ($spooldir,$maintainerlist,$debian_ftproot,$nonUS_ftproot,$debian_sources,$nonUS_sources,$pseudolist);
-our ($nonuslist,$versionindex,$versionpkgdir);
+our ($spooldir,$maintainerlist,$debian_ftproot,$debian_sources,$pseudolist);
 
 # General configuration stuff
 
@@ -15,30 +14,19 @@ if ($host eq "master" or $host eq "spohr" or $host eq "rietz") {
        $spooldir       = "/org/bugs.debian.org/debbugs/spool/db-h";
        $maintainerlist = "/etc/debbugs/Maintainers";
        $debian_ftproot = "/org/bugs.debian.org/etc/indices/ftp/testing";
-       $nonUS_ftproot  = "/org/bugs.debian.org/etc/indices/nonus/testing";
        $debian_sources = "/etc/debbugs/indices/ftp.sources";
-       $nonUS_sources  = "/etc/debbugs/indices/nonus.sources";
        $pseudolist     = "/org/bugs.debian.org/etc/pseudo-packages.description";
-       $nonuslist      = "/debian/home/maor/masterfiles/Packages.non-US";
-       $versionindex   = "/org/bugs.debian.org/versions/indices/versions.idx";
-       $versionpkgdir  = "/org/bugs.debian.org/versions/pkg";
 } 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";
-       $nonUS_ftproot  = "/org/bugs.debian.org/etc/indices/nonus/testing";
        $debian_sources = "/etc/debbugs/indices/ftp.sources";
-       $nonUS_sources  = "/etc/debbugs/indices/nonus.sources";
        $pseudolist     = "/org/bugs.debian.org/etc/pseudo-packages.description";
-       $nonuslist      = "/debian/home/maor/masterfiles/Packages.non-US";
-       $versionindex = "/org/bugs.debian.org/versions/indices/versions.idx";
-       $versionpkgdir = "/org/bugs.debian.org/versions/pkg";
 } else {
        die "Unknown machine, please configure paths in bugcfg.pm\n";
 }
 
-our $btsURL                    = "http://www.debian.org/Bugs/";
-our @architectures             = ( "i386", "m68k", "alpha", "sparc", "powerpc", "arm", "hppa", "ia64", "mips", "mipsel", "s390" );
+our @architectures             = ( "i386", "amd64", "alpha", "sparc", "powerpc", "arm", "hppa", "ia64", "mips", "mipsel", "s390" );
 our @sections          = ( "main", "contrib", "non-free" );
 our @priorities                = ( "serious", "grave", "critical" );
 our @skiptags          = ( );