From 76a69162af0f6320372f9df907354e52056f160c Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Tue, 16 May 2006 22:30:50 -0700 Subject: [PATCH] * 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) --- debian/changelog | 15 ++- html/server-control.html.in | 8 +- html/server-refcard.html.in | 2 + scripts/process.in | 179 ++++++++++++++++++++---------------- 4 files changed, 117 insertions(+), 87 deletions(-) mode change 100644 => 100755 scripts/process.in diff --git a/debian/changelog b/debian/changelog index 6502ad4..82343c5 100644 --- 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 Fri, 20 Jun 2003 18:57:25 +0100 diff --git a/html/server-control.html.in b/html/server-control.html.in index 579cf8b..e570f4a 100644 --- a/html/server-control.html.in +++ b/html/server-control.html.in @@ -150,7 +150,7 @@ mailservers is available via the WWW, in

For their meanings please consult the general developers' documentation for the $gBug system. -

clone bugnumber [ new IDs ] +
clone bugnumber NewID [ new IDs ... ]
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

Merged reports are all expired simultaneously, and only when all of the reports each separately meet the criteria for expiry. +

forcemerge bugnumber bugnumber ... +
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. +
unmerge bugnumber
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 ed83f89..838e8ff 100644 --- a/html/server-refcard.html.in +++ b/html/server-refcard.html.in @@ -73,7 +73,9 @@ sending the word help to each mailserver. address | !
  • noowner bugnumber
  • retitle bugnumber new-title +
  • clone bugnumber NewID [ new IDs ... ]
  • merge bugnumber bugnumber ... +
  • forcemerge bugnumber bugnumber ...
  • unmerge bugnumber
  • tag bugnumber [+-=] tag ...
  • block bugnumber by bug ... diff --git a/scripts/process.in b/scripts/process.in old mode 100644 new mode 100755 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 ? < -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" => "", + "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", + ],< -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" => "", + "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", + ],< -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" => "", + "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", + ],< -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" => "", + "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", + ],< -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" => "", + "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", + ],< -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" => "", + "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", + ],<