merge changes from dla mainline

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index abc856bc64245b5dcc7852bb1b2e88252c782864..cce3fbd4ec62b2644ad954297d1cf05a619127e3 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -442,9 +442,11 @@ if (defined $pkg || defined $src) {
             $references[$#references] = "or $references[$#references]" if @references > 1;
             print "<p>You might like to refer ", join(", ", @references), ".</p>\n";
         }
-        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${debbugs::gHTMLSuffix}");
+       if (defined $maint || defined $maintenc) {
+            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${debbugs::gHTMLSuffix}");
+       }
     } else {
         print "<p>There is no record of the " .
               (defined($pkg) ? htmlsanit($pkg) . " package"

diff --git a/debian/changelog b/debian/changelog
index 78e00625065d7e2672fb89a7f5b48227dd99a27c..801316bbad2e2eac13e4bfc6f43019a9c409af68 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -127,6 +127,11 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Split forwarded on commas for linking (closes: #367813)
     - Don't display duplicate bugs (closes: #348116)
     - Display links to archived bugs for all searches (closes: #53710)
+    - Link to blocked bugs in the bugreport.cgi output (closes: #326077)
+    - Don't ask for more bugs if there is no maintainer (closes: #355190)
+    - Stop refering to developers on the index page (closes: #355768)
+    - Change control@ stop regex and documentation to match eachother
+      (closes: #366093)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100

diff --git a/html/Developer.html.in b/html/Developer.html.in
index ee285ae532813a81f7d4e6a5ebe002475b5f6434..8f8e7881fdc85e5208ea0ef40bc17566fdd0c50f 100644 (file)
--- a/html/Developer.html.in
+++ b/html/Developer.html.in
@@ -128,9 +128,13 @@ reported the $gBug and
 <code>CC</code> field.
 
 <p>Ask the author to preserve the <code>CC</code> to
-<var>nnn</var><code>-forwarded\@$gEmailDomain</code> when they reply, so that
-the $gBug tracking system will file their reply with the original
-report.
+<var>nnn</var><code>-forwarded\@$gEmailDomain</code>
+and <var>nnn</var><code>\@$gEmailDomain</code> when they reply, so
+that the $gBug tracking system will file their reply with the original
+report. These messages are only filed and are not sent on; to send a
+message as normal, send them
+to <var>nnn</var><code>\@$gEmailDomain</code> as well.</p>
+
 
 <p>When the $gBug tracking system gets a message at
 <var>nnn</var><code>-forwarded</code> it will mark the relevant $gBug as

diff --git a/html/index.html.in b/html/index.html.in
index e09d8cf6d6c56ef6d120865586bbe825463d8d61..5c8745129a5c049647c21300d70f24bb73eee550 100644 (file)
--- a/html/index.html.in
+++ b/html/index.html.in
@@ -25,8 +25,8 @@ $gHTMLCopies
 </ul>
 
 <ul>
-  <li><a href="Developer$gHTMLSuffix">Developers' information on how to use the system</a>
-  <li><a href="server-control$gHTMLSuffix">Developers' information on manipulating $gBugs by email</a>
+  <li><a href="Developer$gHTMLSuffix">Advanced information on how to use the system</a>
+  <li><a href="server-control$gHTMLSuffix">Information on manipulating $gBugs by email</a>
   <li><a href="server-refcard$gHTMLSuffix">Mailservers' reference card</a>
 </ul>
 

diff --git a/html/server-control.html.in b/html/server-control.html.in
index e570f4a997117893cb0c2c6df82c355ffbbf0c2d..8120307f8df4747e70bbd3f3bab401c07b73881f 100644 (file)
--- a/html/server-control.html.in
+++ b/html/server-control.html.in
@@ -340,12 +340,20 @@ mailservers is available via the WWW, in
 
 <dt><code>quit</code>
 <dt><code>stop</code>
-<dt><code>thank</code>...
-<dt><code>--</code>...
-
-  <dd>Tells the control server to stop processing the message; the remainder
-      of the message can include explanations, signatures or anything else,
-      none of it will be detected by the control server.
+<dt><code>thank</code>
+<dt><code>thanks</code>
+<dt><code>thankyou</code>
+<dt><code>thank you</code>
+<dt><code>--</code>
+<!-- #366093, I blame you! -->
+<!-- <dt><code>kthxbye</code> -->
+<!-- See... I documented it! -->
+
+  <dd>On a line by itself, in any case, possibly followed by
+      whitespace, tells the control server to stop processing the
+      message; the remainder of the message can include explanations,
+      signatures or anything else, none of it will be detected by the
+      control server.
 
 </dl>
 

diff --git a/scripts/receive.in b/scripts/receive.in
index 873b122f40376f2f1d995fe850911efa2e6e38a7..815b6c80c649acdbfc7550a5deacc761d0e48c41 100755 (executable)
--- a/scripts/receive.in
+++ b/scripts/receive.in
@@ -67,7 +67,7 @@ y/A-Z/a-z/;
 if (s/^(\d{1,9})\b//) {
     $bugnumber= $1;
     if (not exists $withbugaddressmap{$_} and
-/-(?:(?:un)?subscribe|subhelp|ignore|(?:sub(?:yes|approve|reject)
+/-(?:(?:un)?subscribe|subhelp|help|ignore|(?:sub(?:yes|approve|reject)
  |unsubyes|bounce|probe|approve|reject|
  setlistyes|setlistsilentyes).*)/x
        ) {

diff --git a/scripts/service.in b/scripts/service.in
index d7f58ba680e5b9d5667eb29dffb1d98f70a33673..a37b5bacacf6c7f4146c49d2e4f85f86783b0f80 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -168,7 +168,7 @@ for ($procline=0; $procline<=$#bodylines; $procline++) {
     &transcript("> $_\n");
     next if m/^\s*\#/;
     $action= '';
-    if (m/^stop/i || m/^quit/i || m/^--/ || m/^thank/i || m/^kthxbye/i) {
+    if (m/^stop\s*$/i || m/^quit\s*$/i || m/^--\s*$/ || m/^thank(?:s|\s*you)?\s*$/i || m/^kthxbye\s*$/i) {
        &transcript("Stopping processing here.\n\n");
         last;
     } elsif (m/^debug\s+(\d+)$/i && $1 >= 0 && $1 <= 1000) {