[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 8dd1f5a27479f4399bf10fc37ad3cbbdaac39792..f90ea760869680cf7134e559bca825d25fa7b277 100644 (file)
--- 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 f9e1e33e04da93fe570b51566f8edd203b0e3a9f..f850b6515e58069cfaea2328ffc468927d9efbb7 100644 (file)
--- 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 <<END;
 Status: 301 Redirect
 Location: $newurl

diff --git a/cgi/common.pl b/cgi/common.pl
index ffa51b66194049b69a53a9f9481e53fce1a728cc..2dea01b7fb271606070037fa322283138eb6e875 100644 (file)
--- a/cgi/common.pl
+++ b/cgi/common.pl
@@ -244,7 +244,7 @@ sub htmlizebugs {
             $severity = $debbugs::gDefaultSeverity if ($severity eq '');
             next unless defined $section{${pending} . "_" . ${severity}};
             $result .= "<HR><H2>$debbugs::gSeverityDisplay{$severity} - $displayshowpending{$pending}</H2>\n";
-            $result .= "(A list of <a href=\"http://www.debian.org/Bugs/db/si/$pending$severity\">all such bugs</a> is available).\n";
+            $result .= "(A list of <a href=\"${debbugs::gWebDomain}/db/si/$pending$severity\">all such bugs</a> is available).\n";
             $result .= "<UL>\n";
            $result .= $section{$pending . "_" . $severity}; 
            $result .= "</UL>\n";

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 868d819456b8ef677767ce61f46d64bd96ee3914..6fe13e76e54b2895b190b8bfffa52c016bb952a7 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -114,7 +114,7 @@ if (defined $pkg) {
     print "<p>Note that with multi-binary packages there may be other\n";
     print "reports filed under the different binary package names.</p>\n";
     print "\n";
-    printf "<p>You might like to refer to the <a href=\"%s\">%s package page</a></p>\n", urlsanit("http://packages.debian.org/$pkg"), htmlsanit("$pkg");
+    printf "<p>You might like to refer to the <a href=\"%s\">%s package page</a></p>\n", urlsanit("http://${debbugs::gPackagePages}/$pkg"), htmlsanit("$pkg");
 } elsif (defined $maint || defined $maintenc) {
     print "<p>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 6242ecafd41be14f034069b8203d7a08863a3d80..d2cac161cafdeb289c41c88b1454fb9ed5feb022 100644 (file)
--- 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 051e09e41934665cdd68b0f89578d670d4abf320..b24a3132c8f9f2bcc4e899c5901a882e8d9928d1 100755 (executable)
--- 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 6a5015e318618614f873b99b6b0e956f2bcb5565..5bc708e8ab16628821b6d735daab8f452252e13b 100644 (file)
--- 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 05ed4ed4b5c9fd7d62f87bcdf29c38bab6490436..97f8955cc5c08c8cd08c30ee60d5a32c6af6cb9d 100644 (file)
--- 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 ac5d8da1bb37bac4e8ce2b81ce9eb7577a36bd01..dafd69e3af8cf561265648d5ab89fdc305db7a4d 100755 (executable)
--- 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 <<END
 From: $gMaintainerEmail ($gProject $gBug Tracking System)
 To: $gMirrorList\@$gListDomain
 Subject: $gProject $gBugs autoupdate 259012
-Message-ID: <handle.htmlup.$seqmid\@gEmailDebian>
+Message-ID: <handle.htmlup.$seqmid\@$gEmailDomain>
 X-$gProject=PR: update $sequences
 
 END
@@ -66,7 +66,7 @@ print(MM <<END
 From: $gMaintainerEmail ($gProject $gBug Tracking System)
 To: $gMaintainerEmail
 Subject: $gProject $gBugs autoupdate 259012
-Message-ID: <handle.htmlup.$seqmid\@gEmailDebian>
+Message-ID: <handle.htmlup.$seqmid\@$gEmailDomain>
 X-$gProject=PR: update $sequences
 
 END