* Fix the documentation of clone to indicate that you need at least

   one newID (closes: #276747)
 * Use create_mime_message to send all of the mails which may contain
   UTF8 material. (closes: #364026)
 * Add links to Closes: text for closed bugs. (closes: #320986)

diff --git a/debian/changelog b/debian/changelog
index 6502ad498395aab5744500a0faf5812b776e15ee..82343c59616c6ff83b190c4c4cc4195032ce0d7e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -91,11 +91,11 @@ debbugs (2.4.2) UNRELEASED; urgency=low
       warnings are returned. This fixes bad addresses causing sendmail to
       exit and destroying the bug log. (closes: #191306)
     - Add rudimentary Test::More modules for testing Debbugs::Mime and
-      Debbugs::Mail. These are currently not called as part of the build
-      process.
+      Debbugs::Mail.
     - Allow X-debbugs-* to be set in pseudo headers. (closes: #179340)
     - Obey X-Debbugs-No-Ack in control@ messages. (closes: #201825)
-    - Allow forwarded: to be set at submit@ time. (closes: #128320)
+    - Allow forwarded: and owner to be set at submit@ time.
+      (closes:#128320)
     - Fix example rewrite rules to allow for #1234 and foo+bar@baz.com
       (closes: #321925)
     - Output proper charset for attachments (closes: #335813)
@@ -105,8 +105,13 @@ debbugs (2.4.2) UNRELEASED; urgency=low
       bugs which are in the same package. (closes: #286792)
     - Make all packages lowercase to support packages with uppercase
       names, even though that's insane. (closes: #67067)
-    - Change acknoledged to close (closes: #61341) and indicate who
-      actually closed the bug (closes: #355968)
+    - Change acknowledged to close (closes: #61341) and indicate who
+      actually closed the bug (closes: #355968, #132274)
+    - Fix the documentation of clone to indicate that you need at least
+      one newID (closes: #276747)
+    - Use create_mime_message to send all of the mails which may contain
+      UTF8 material. (closes: #364026)
+    - Add links to Closes: text for closed bugs. (closes: #320986)
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
 

diff --git a/html/server-control.html.in b/html/server-control.html.in
index 579cf8bcd3815d7cbad3272e8f126a3d292f4b74..e570f4a997117893cb0c2c6df82c355ffbbf0c2d 100644 (file)
--- a/html/server-control.html.in
+++ b/html/server-control.html.in
@@ -150,7 +150,7 @@ mailservers is available via the WWW, in
   <p>For <a href="Developer.html#severities">their meanings</a> please
   consult the general developers' documentation for the $gBug system.
 
-<dt><code>clone</code> <var>bugnumber</var> [ <var>new IDs</var> ]
+<dt><code>clone</code> <var>bugnumber</var> <var>NewID</var> [ <var>new IDs</var> ... ]
 
   <dd>The clone control command allows you to duplicate a $gBug report. It is
   useful in the case where a single report actually indicates that multiple
@@ -202,6 +202,12 @@ mailservers is available via the WWW, in
   <p>Merged reports are all expired simultaneously, and only when all of
   the reports each separately meet the criteria for expiry.
 
+<dt><code>forcemerge</code> <var>bugnumber</var> <var>bugnumber</var> ...
+  <dd>Forcibly merges two or more $gBug reports. The first bug is
+  chosen as the master bug, and its seetings are assigned to the bugs
+  listed next in the command. See the text above for a description of
+  what merging means.
+
 <dt><code>unmerge</code> <var>bugnumber</var>
 
   <dd>Disconnects a $gBug report from any other reports with which it may have

diff --git a/html/server-refcard.html.in b/html/server-refcard.html.in
index ed83f893337516aed0928d36c0a1508b8f61d295..838e8ffe9f23f03ddf566670663155a43b01af40 100644 (file)
--- a/html/server-refcard.html.in
+++ b/html/server-refcard.html.in
@@ -73,7 +73,9 @@ sending the word <code>help</code> to each mailserver.
       <var>address</var> | <code>!</code>
   <li><code>noowner</code> <var>bugnumber</var>
   <li><code>retitle</code> <var>bugnumber</var> <var>new-title</var>
+  <li><code>clone</code> <var>bugnumber</var> <var>NewID</var> [ <var>new IDs</var> ... ]
   <li><code>merge</code> <var>bugnumber</var> <var>bugnumber</var> ...
+  <li><code>forcemerge</code> <var>bugnumber</var> <var>bugnumber</var> ...
   <li><code>unmerge</code> <var>bugnumber</var>
   <li><code>tag</code> <var>bugnumber</var> [+-=] <var>tag</var> ...
   <li><code>block</code> <var>bugnumber</var> <code>by</code> <var>bug</code> ...

diff --git a/scripts/process.in b/scripts/process.in
old mode 100644 (file)
new mode 100755 (executable)
index dc0f465..aed3423
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -781,20 +781,21 @@ unless (exists $header{'x-debbugs-no-ack'}) {
                  ($veryquiet ?
                   "New $gBug report received and filed, but not forwarded." :
                   "New $gBug report received and forwarded."). $htmlbreak);
-        &sendmessage($veryquiet ? <<END : $codeletter eq 'M' ? <<END : <<END,'');
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Acknowledgement of QUIET report
-         ($subject)
-Message-ID: <handler.$ref.$nn.ackquiet\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack-quiet $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-Reply-To: $ref-quiet\@$gEmailDomain
-
+       if ($veryquiet) {
+            &sendmessage(create_mime_message(
+                      ["X-Loop"      => "$gMaintainerEmail",
+                       From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+                       To            => $replyto,
+                        Subject       => "$gBug#$ref: Acknowledgement of QUIET report ($subject)",
+                        "Message-ID"  => "<handler.$ref.$nn.ackquiet\@$gEmailDomain>",
+                        "In-Reply-To" => $header{'message-id'},
+                        References    => $header{'message-id'},
+                        Precedence    => 'bulk',
+                       "X-$gProject-PR-Message"  => "ack-quiet $ref",
+                       "X-$gProject-PR-Package"  => $data->{package},
+                       "X-$gProject-PR-Keywords" => $data->{keywords},
+                       "Reply-To"                => "$ref-quiet\@$gEmailDomain",
+                      ],<<END,[join("\n", @msg)]), '',undef,1);
 Thank you for the problem report you have sent regarding $gProject.
 This is an automatically generated reply, to let you know your message
 has been received.  It has not been forwarded to the package maintainers
@@ -812,19 +813,22 @@ $brokenness
 $gMaintainer
 (administrator, $gProject $gBugs database)
 END
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Acknowledgement of maintainer-only report
-         ($subject)
-Message-ID: <handler.$ref.$nn.ackmaint\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack-maintonly $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-Reply-To: $ref-maintonly\@$gEmailDomain
-
+       }
+       elsif ($codeletter eq 'M') {
+            &sendmessage(create_mime_message(
+                      ["X-Loop"      => "$gMaintainerEmail",
+                       From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+                       To            => $replyto,
+                        Subject       => "$gBug#$ref: Acknowledgement of maintainer-only report ($subject)",
+                        "Message-ID"  => "<handler.$ref.$nn.ackmaint\@$gEmailDomain>",
+                        "In-Reply-To" => $header{'message-id'},
+                        References    => $header{'message-id'},
+                        Precedence    => 'bulk',
+                       "X-$gProject-PR-Message" => "ack-maintonly $ref",
+                       "X-$gProject-PR-Package"  => $data->{package},
+                       "X-$gProject-PR-Keywords" => $data->{keywords},
+                       "Reply-To"               => "$ref-maintonly\@$gEmailDomain",
+                      ],<<END,[]), '',undef,1);
 Thank you for the problem report you have sent regarding $gProject.
 This is an automatically generated reply, to let you know your message has
 been received.  It is being forwarded to the package maintainers (but not
@@ -841,18 +845,22 @@ $brokenness
 $gMaintainer
 (administrator, $gProject $gBugs database)
 END
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Acknowledgement ($subject)
-Message-ID: <handler.$ref.$nn.ack\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-Reply-To: $ref\@$gEmailDomain
-
+                  }
+       else {
+            &sendmessage(create_mime_message(
+                      ["X-Loop"      => "$gMaintainerEmail",
+                       From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+                       To            => $replyto,
+                        Subject       => "$gBug#$ref: Acknowledgement ($subject)",
+                        "Message-ID"  => "<handler.$ref.$nn.ack\@$gEmailDomain>",
+                        "In-Reply-To" => $header{'message-id'},
+                        References    => $header{'message-id'},
+                        Precedence    => 'bulk',
+                       "X-$gProject-PR-Message"  => "ack $ref",
+                       "X-$gProject-PR-Package"  => $data->{package},
+                       "X-$gProject-PR-Keywords" => $data->{keywords},
+                       "Reply-To"                => "$ref\@$gEmailDomain",
+                      ],<<END,[]), '',undef,1);
 Thank you for the problem report you have sent regarding $gProject.
 This is an automatically generated reply, to let you know your message has
 been received.  It is being forwarded to the package maintainers and other
@@ -868,26 +876,28 @@ $brokenness
 $gMaintainer
 (administrator, $gProject $gBugs database)
 END
+                  }
     } elsif ($codeletter ne 'U' and
              $header{'precedence'} !~ /\b(?:bulk|junk|list)\b/) {
         &htmllog("Acknowledgement","sent",$replyto,
                  ($veryquiet ? "Extra info received and filed, but not forwarded." :
                   $codeletter eq 'M' ? "Extra info received and forwarded to maintainer." :
                   "Extra info received and forwarded to list."). $htmlbreak);
-        &sendmessage($veryquiet ? <<END : $codeletter eq 'M' ? <<END : <<END,'');
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Info received and FILED only
-         (was $subject)
-Message-ID: <handler.$ref.$nn.ackinfoquiet\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack-info-quiet $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-Reply-To: $ref-quiet\@$gEmailDomain
-
+       if ($veryquiet) {
+            &sendmessage(create_mime_message(
+                      ["X-Loop"      => "$gMaintainerEmail",
+                       From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+                       To            => $replyto,
+                        Subject       => "$gBug#$ref: Info received and FILED only (was $subject)",
+                        "Message-ID"  => "<handler.$ref.$nn.ackinfoquiet\@$gEmailDomain>",
+                        "In-Reply-To" => $header{'message-id'},
+                        References    => $header{'message-id'},
+                        Precedence    => 'bulk',
+                       "X-$gProject-PR-Message" => "ack-info-quiet $ref",
+                       "X-$gProject-PR-Package"  => $data->{package},
+                       "X-$gProject-PR-Keywords" => $data->{keywords},
+                       "Reply-To"               => "$ref-maintonly\@$gEmailDomain",
+                      ],<<END,[]), '',undef,1);
 Thank you for the additional information you have supplied regarding
 this problem report.  It has NOT been forwarded to the package
 maintainers, but will accompany the original report in the $gBug
@@ -903,19 +913,22 @@ $brokenness
 $gMaintainer
 (administrator, $gProject $gBugs database)
 END
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Info received for maintainer only
-         (was $subject)
-Message-ID: <handler.$ref.$nn.ackinfomaint\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack-info-maintonly $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-Reply-To: $ref-maintonly\@$gEmailDomain
-
+                }
+       elsif ($codeletter eq 'M') {
+            &sendmessage(create_mime_message(
+                      ["X-Loop"      => "$gMaintainerEmail",
+                       From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+                       To            => $replyto,
+                        Subject       => "$gBug#$ref: Info received for maintainer only (was $subject)",
+                        "Message-ID"  => "<handler.$ref.$nn.ackinfomaint\@$gEmailDomain>",
+                        "In-Reply-To" => $header{'message-id'},
+                        References    => "$header{'message-id'} $data->{msgid}",
+                        Precedence    => 'bulk',
+                       "X-$gProject-PR-Message" => "ack-info-maintonly $ref",
+                       "X-$gProject-PR-Package"  => $data->{package},
+                       "X-$gProject-PR-Keywords" => $data->{keywords},
+                       "Reply-To"               => "$ref-maintonly\@$gEmailDomain",
+                      ],<<END,[]), '',undef,1);
 Thank you for the additional information you have supplied regarding
 this problem report.  It has been forwarded to the package maintainer(s)
 (but not to other interested parties) to accompany the original report.
@@ -929,17 +942,22 @@ $brokenness
 $gMaintainer
 (administrator, $gProject $gBugs database)
 END
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $replyto
-Subject: $gBug#$ref: Info received (was $subject)
-Message-ID: <handler.$ref.$nn.ackinfo\@$gEmailDomain>
-In-Reply-To: $header{'message-id'}
-References: $header{'message-id'}
-Precedence: bulk
-X-$gProject-PR-Message: ack-info $ref
-X-$gProject-PR-Package: $data->{package}
-X-$gProject-PR-Keywords: $data->{keywords}
-
+                  }
+       else {
+            &sendmessage(create_mime_message(
+                      ["X-Loop"      => "$gMaintainerEmail",
+                       From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+                       To            => $replyto,
+                        Subject       => "$gBug#$ref: Info received ($subject)",
+                        "Message-ID"  => "<handler.$ref.$nn.ackinfo\@$gEmailDomain>",
+                        "In-Reply-To" => $header{'message-id'},
+                        References    => "$header{'message-id'} $data->{msgid}",
+                        Precedence    => 'bulk',
+                       "X-$gProject-PR-Message"  => "ack-info $ref",
+                       "X-$gProject-PR-Package"  => $data->{package},
+                       "X-$gProject-PR-Keywords" => $data->{keywords},
+                       "Reply-To"                => "$ref\@$gEmailDomain",
+                      ],<<END,[]), '',undef,1);
 Thank you for the additional information you have supplied regarding
 this problem report.  It has been forwarded to the package maintainer(s)
 and to other interested parties to accompany the original report.
@@ -953,10 +971,9 @@ $brokenness
 $gMaintainer
 (administrator, $gProject $gBugs database)
 END
-# Reply-To: in previous ack disabled by doogie due to mail loops.
-# Are these still a concern?
-# Reply-To: $ref\@$gEmailDomain
-    }
+
+                  }
+   }
 }
 
 &appendlog;