X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugcfg.pm;h=8fa127e90b7637bcaf206311de5e032da508a443;hp=d4f700d602ac2590c57c8e275e1ff069b8a8714a;hb=c6c21e31883775d12d06f104c91c6b1a00b48df0;hpb=e6282243da4697d24b03c094e90f750daeb68cdf

diff --git a/bugcfg.pm b/bugcfg.pm
index d4f700d..8fa127e 100644
--- a/bugcfg.pm
+++ b/bugcfg.pm
@@ -1,11 +1,10 @@
 #! /usr/bin/perl
-# vim: ts=4 sw=4 nowrap
+# vim: ts=8 sw=8 nowrap
 
 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", "armel", "hppa", "ia64", "mips", "mipsel", "s390" );
 our @sections		= ( "main", "contrib", "non-free" );
 our @priorities		= ( "serious", "grave", "critical" );
 our @skiptags		= ( );