From: joy <> Date: Sun, 28 Jan 2001 06:09:01 +0000 (-0800) Subject: [project @ 2001-01-27 22:09:01 by joy] X-Git-Tag: release/2.6.0~1161 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2d452deebfac3e89de8098704631de33b011339f;p=debbugs.git [project @ 2001-01-27 22:09:01 by joy] fixed several things reported/patched by Rob Browning, and a couple of more things --- diff --git a/UPGRADE b/UPGRADE index 8dd1f5a2..f90ea760 100644 --- a/UPGRADE +++ b/UPGRADE @@ -5,6 +5,17 @@ From 2.3 to 2.4 --------------- +Add the following variables to the /etc/debbugs/config file: + +$gWebHost = "localhost"; # e.g. www.debian.org +$gWebHostBugDir = "Bugs"; # e.g. Bugs +# For now, don't change this one manually! +$gWebDomain = "$gWebHost/$gWebHostBugDir"; +$gCGIDomain = "$gWebDomain/Bugs/cgi"; # e.g. cgi.debian.org +$gPackagePages = "packages.debian.org"; # e.g. packages.debian.org + +($gWebDomain will probably exist already, change it as shown above.) + Add the following variable to the /etc/debbugs/text file: ############################################################################ diff --git a/cgi/bugs-fetch2.pl.in b/cgi/bugs-fetch2.pl.in index f9e1e33e..f850b651 100644 --- a/cgi/bugs-fetch2.pl.in +++ b/cgi/bugs-fetch2.pl.in @@ -57,7 +57,7 @@ END } $base= $ENV{'HTTP_REFERER'}; -if ($base =~ s:/Bugs/.*$::) { +if ($base =~ s:/${gWebHostBugDir}/.*$::) { for $y (keys %map) { $base= $map{$y} if $base eq $y; } @@ -65,7 +65,7 @@ if ($base =~ s:/Bugs/.*$::) { $base= $in{'base'}; } -$newurl= "$base/Bugs/db/$suburl"; +$newurl= "$base/${gWebHostBugDir}/db/$suburl"; print <all such bugs is available).\n"; + $result .= "(A list of all such bugs is available).\n"; $result .= "\n"; diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi index 868d8194..6fe13e76 100755 --- a/cgi/pkgreport.cgi +++ b/cgi/pkgreport.cgi @@ -114,7 +114,7 @@ if (defined $pkg) { print "

Note that with multi-binary packages there may be other\n"; print "reports filed under the different binary package names.

\n"; print "\n"; - printf "

You might like to refer to the %s package page

\n", urlsanit("http://packages.debian.org/$pkg"), htmlsanit("$pkg"); + printf "

You might like to refer to the %s package page

\n", urlsanit("http://${debbugs::gPackagePages}/$pkg"), htmlsanit("$pkg"); } elsif (defined $maint || defined $maintenc) { print "

Note that maintainers may use different Maintainer fields for\n"; print "different packages, so there may be other reports filed under\n"; diff --git a/debian/README.Debian b/debian/README.Debian index 6242ecaf..d2cac161 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -5,7 +5,7 @@ Configuration ------------- On initial installation, debbugsconfig will be run, and it will copy the basic configuration files to /etc/debbugs. Edit those files to suit your -needs. +needs, and re-run debbugsconfig. WWW --- diff --git a/debian/debbugsconfig b/debian/debbugsconfig index 051e09e4..b24a3132 100755 --- a/debian/debbugsconfig +++ b/debian/debbugsconfig @@ -18,16 +18,17 @@ EOF } $gConfigDir = "/etc/debbugs" if (!defined($gConfigDir)); -&template("config"); +&template("config", $gConfigDir); require "$gConfigDir/config"; unshift @INC, $gConfigDir; -&template("text"); +&template("text", $gConfigDir); require "text"; -&template("Maintainers"); -&template("pseudo-packages.description"); -&template("nextnumber"); +&template("Maintainers", $gConfigDir); +&template("pseudo-packages.description", $gConfigDir); + +&template("nextnumber", $gSpoolDir); # stuff used when testing (comment out the above) #unshift @INC, "../"; @@ -61,11 +62,11 @@ exit(0); # -------------------------------------------------------------------------- # sub template { - my ($name) = @_; - if (! -f "$gConfigDir/$name") { - system("cp /usr/share/doc/debbugs/examples/$name $gConfigDir/$name") == 0 || + my ($name, $destdir) = @_; + if (! -f "$destdir/$name") { + system("cp /usr/share/doc/debbugs/examples/$name $destdir/$name") == 0 || die "$!"; - print "created $gConfigDir/$name from template.\n"; + print "created $destdir/$name from template.\n"; } } diff --git a/email/notify-closed-control.txt b/email/notify-closed-control.txt index 6a5015e3..5bc708e8 100644 --- a/email/notify-closed-control.txt +++ b/email/notify-closed-control.txt @@ -11,9 +11,7 @@ This is an automatic notification regarding your GTAG_BUG report. It has been marked as closed by one of the developers, namely LTAG_REPLY_TO. -You should be hearing from them with a substantive response shortly, -if you have not already done so. If not, please contact them -directly or email the Developer's list at debian-devel@lists.debian.org. +GTAG_BUG_CLOSURE_MSG_BODY GTAG_MAINTAINER_NAME (administrator, GTAG_PROJECT GTAG_BUG database) diff --git a/scripts/config.in b/scripts/config.in index 05ed4ed4..97f8955c 100644 --- a/scripts/config.in +++ b/scripts/config.in @@ -1,13 +1,17 @@ # This is the template debbugs configuration file. # You *must* edit it in order for debbugs to work. -# $Id: config.in,v 1.11 2000/10/10 23:42:14 joy Exp $ +# $Id: config.in,v 1.12 2001/01/27 22:09:01 joy Exp $ # Domains $gEmailDomain = "bugs.something"; # e.g. bugs.debian.org $gListDomain = "lists.something"; # e.g. lists.debian.org -$gWebDomain = "localhost/Bugs"; # e.g. www.debian.org/Bugs +$gWebHost = "localhost"; # e.g. www.debian.org +$gWebHostBugDir = "Bugs"; # e.g. Bugs +# For now, don't change this one manually! +$gWebDomain = "$gWebHost/$gWebHostBugDir"; $gCGIDomain = "$gWebDomain/Bugs/cgi"; # e.g. cgi.debian.org $gMirrors = ""; # comma separated list +$gPackagePages = "packages.debian.org"; # e.g. packages.debian.org # Project identification $gProject = "Something"; # e.g. Debian diff --git a/scripts/html-control.in b/scripts/html-control.in index ac5d8da1..dafd69e3 100755 --- a/scripts/html-control.in +++ b/scripts/html-control.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: html-control.in,v 1.5 2000/10/07 17:27:13 joy Exp $ +# $Id: html-control.in,v 1.6 2001/01/27 22:09:01 joy Exp $ use POSIX; @@ -56,7 +56,7 @@ print(MM < +Message-ID: X-$gProject=PR: update $sequences END @@ -66,7 +66,7 @@ print(MM < +Message-ID: X-$gProject=PR: update $sequences END