[project @ 2003-01-28 23:52:08 by cjwatson]

Add a $gHTMLSuffix variable so that we can stop breaking content
negotiation on bugs.debian.org while still having the links in the debbugs
package work.

diff --git a/UPGRADE b/UPGRADE
index ff61fd0b995d3540370a048997a80c4e47c94fc3..0df0d9518b8122536941867999568213de49e11d 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -2,6 +2,13 @@
                             Debbugs upgrade notes
                            +=====================+
 
+From 2.4 to 2.4.1
+-----------------
+
+Add the following variables to the /etc/debbugs/config file:
+
+$gHTMLSuffix = ".html";
+
 From 2.3 to 2.4
 ---------------
 

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 8ecd8b6e4025ad67c261f973d07fbcd976ffaf98..7d791817b083a30f3e17149ea757bc9c23f35f5a 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -215,7 +215,7 @@ if (defined $pkg || defined $src) {
            my @references;
            my $pseudodesc = getpseudodesc();
            if (defined($pseudodesc) and exists($pseudodesc->{$pkg})) {
-               push @references, "to the <a href=\"http://${debbugs::gWebDomain}/pseudo-packages.html\">list of other pseudo-packages</a>";
+               push @references, "to the <a href=\"http://${debbugs::gWebDomain}/pseudo-packages${debbugs::gHTMLSuffix}\">list of other pseudo-packages</a>";
            } else {
                push @references, sprintf "to the <a href=\"%s\">%s package page</a>", urlsanit("http://${debbugs::gPackagePages}/$pkg"), htmlsanit("$pkg");
            }
@@ -228,7 +228,7 @@ if (defined $pkg || defined $src) {
        }
        print "<p>If you find a bug not listed here, please\n";
        printf "<a href=\"%s\">report it</a>.</p>\n",
-              urlsanit("http://${debbugs::gWebDomain}/Reporting.html");
+              urlsanit("http://${debbugs::gWebDomain}/Reporting${debbugs::gHTMLSuffix}");
     } else {
        print "<p>There is no record of the " .
              (defined($pkg) ? htmlsanit($pkg) . " package"

diff --git a/scripts/config.debian b/scripts/config.debian
index 19b4ccd9ac902b1f4ea4eef516eb6f66711838ce..750f2381e9f01ce6b9460480c69dc5784760d531 100644 (file)
--- a/scripts/config.debian
+++ b/scripts/config.debian
@@ -1,10 +1,11 @@
 # This is the bugs.debian.org debbugs configuration file.
-# $Id: config.debian,v 1.15 2002/11/17 22:45:16 cjwatson Exp $
+# $Id: config.debian,v 1.16 2003/01/28 23:52:08 cjwatson Exp $
 
 # Domains
 $gEmailDomain = "bugs.debian.org";
 $gListDomain = "lists.debian.org";
 $gWebDomain = "www.debian.org/Bugs";
+$gHTMLSuffix = "";
 $gPackagePages = "packages.debian.org";
 $gCGIHost = "bugs.debian.org";
 $gCGIPath = "/cgi-bin/";

diff --git a/scripts/config.in b/scripts/config.in
index 1371059ab07b3f5f2d0cc794e537d55de8edb78a..d885705c0589eabbf031e1c55a77d143d9e16453 100644 (file)
--- a/scripts/config.in
+++ b/scripts/config.in
@@ -1,6 +1,6 @@
 # This is the template debbugs configuration file.
 # You *must* edit it in order for debbugs to work.
-# $Id: config.in,v 1.16 2002/11/17 22:45:16 cjwatson Exp $
+# $Id: config.in,v 1.17 2003/01/28 23:52:08 cjwatson Exp $
 
 # Domains
 $gEmailDomain = "bugs.something";                      # e.g. bugs.debian.org
@@ -9,6 +9,7 @@ $gWebHost = "localhost";                                # e.g. www.debian.org
 $gWebHostBugDir = "Bugs";                              # e.g. Bugs
 # For now, don't change this one manually!
 $gWebDomain = "$gWebHost/$gWebHostBugDir";
+$gHTMLSuffix = ".html";
 $gCGIDomain = "$gWebDomain/Bugs/cgi";                  # e.g. cgi.debian.org
 $gMirrors = "";                                                # comma separated list
 $gPackagePages = "packages.debian.org";                 # e.g. packages.debian.org

diff --git a/scripts/process.in b/scripts/process.in
index ddc85e4edf6413e391de684a91feac8a4c8f63aa..a1aa8c21b21fc812b76819aa6944d9e543823ae1 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.58 2003/01/05 17:54:23 cjwatson Exp $
+# $Id: process.in,v 1.59 2003/01/28 23:52:08 cjwatson Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -482,7 +482,7 @@ pseudo-header at all.
 
 This makes it much harder for us to categorise and deal with your
 problem report. Please _resubmit_ your report and tell us which package
-the report is on. For help, check out http://$gWebDomain/Reporting.html.
+the report is on. For help, check out http://$gWebDomain/Reporting$gHTMLSuffix.
 
 Your message was dated $header{'date'} and had
 message-id $header{'message-id'}

diff --git a/scripts/receive.in b/scripts/receive.in
index 2fe600fe55777adeb638edd3b4c3478028673179..fdede3da5ace37b086bee24ea6e45debf90febc0 100755 (executable)
--- a/scripts/receive.in
+++ b/scripts/receive.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: receive.in,v 1.14 2002/11/17 22:45:16 cjwatson Exp $
+# $Id: receive.in,v 1.15 2003/01/28 23:52:08 cjwatson Exp $
 # usage: mail is piped directly into program
 
 #set umask in order to have group-writable incoming/*
@@ -95,9 +95,9 @@ $gBadEmailPrefix (all \@$gEmailDomain.)
 $gBadEmailPrefix
 $gBadEmailPrefix For instructions via the WWW see:
 $gBadEmailPrefix   http://$gWebDomain/
-$gBadEmailPrefix   http://$gWebDomain/Reporting.html
-$gBadEmailPrefix   http://$gWebDomain/Developer.html
-$gBadEmailPrefix   http://$gWebDomain/Access.html
+$gBadEmailPrefix   http://$gWebDomain/Reporting$gHTMLSuffix
+$gBadEmailPrefix   http://$gWebDomain/Developer$gHTMLSuffix
+$gBadEmailPrefix   http://$gWebDomain/Access$gHTMLSuffix
 $gTextInstructions
 $gBadEmailPrefix For details of how to access $gBug report logs by email:
 $gBadEmailPrefix   send \`request\@$gEmailDomain' the word \`help'