X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugcfg.pm;h=c53a9f5dc7323b0a7a795ae49384094f1e2a932a;hp=c7849f1cbaeecfd1813cf6d2c399a03ed5318992;hb=817d5389c87ae35e3dabbcc689d1fd77a339daa2;hpb=cac380009b0be4c643c734fb5da0801a1e570630

diff --git a/bugcfg.pm b/bugcfg.pm
index c7849f1..c53a9f5 100644
--- a/bugcfg.pm
+++ b/bugcfg.pm
@@ -1,34 +1,35 @@
 #! /usr/bin/perl
 # vim: ts=4 sw=4 nowrap
 
+use strict;
+use warnings;
+package bugcfg;
+our ($spooldir,$maintainerlist,$debian_ftproot,$debian_sources,$pseudolist);
+
 # General configuration stuff
 
-$host=`hostname`;
+my $host=`hostname`;
 chomp $host;
 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";
-} elsif ($host eq "lightning") {
-	$spooldir	= "/debian/home/iwj/debian-bugs/spool/db";
-	$maintainerlist = "/debian/debian/indices/Maintainers";
-	$ftproot	= "/debian/debian/dists/potato/";
-	$pseudolist	= "/debian/home/maor/masterfiles/pseudo-packages.description";
-	$nonuslist	= "/debian/home/maor/masterfiles/Packages.non-US";
+} 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";
 }
 
-$btsURL			= "http://www.debian.org/Bugs/";
-@architectures		= ( "i386", "m68k", "alpha", "sparc", "powerpc", "arm", "hppa", "ia64", "mips", "mipsel", "s390" );
-@sections		= ( "main", "contrib", "non-free" );
-@priorities		= ( "serious", "grave", "critical" );
-@skiptags		= ( "wontfix", "fixed" );
+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		= ( );
 
 1;