From 34f7514e64af15ac995b6d66811525735de3a603 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@volo>
Date: Sat, 10 Jun 2006 00:34:23 -0700
Subject: [PATCH]  * Document the addresses available in process.in  * Support
 cloned bugs in control blocking

---
 debian/changelog            |  2 ++
 html/server-refcard.html.in | 14 ++++++++++++++
 scripts/service.in          |  8 +++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 30164c2..9c3c10f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -113,6 +113,8 @@ debbugs (2.4.2) UNRELEASED; urgency=low
       UTF8 material. (closes: #364026)
     - Add links to Closes: text for closed bugs. (closes: #320986)
     - Add X-$gProject-PR-Source: line (closes: #219230)
+    - Document nnn.*@foobar addresses (closes: #188670)
+    - Support cloned bugs in control blocking (closes: #337329)
   
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
diff --git a/html/server-refcard.html.in b/html/server-refcard.html.in
index 838e8ff..c1f09b8 100644
--- a/html/server-refcard.html.in
+++ b/html/server-refcard.html.in
@@ -90,6 +90,20 @@ you, the person doing the reopen.
 $gHTMLSeverityDesc
 </dl>
 
+<h2>Synopsis of bug submission and followup addresses</h2>
+
+<ul compact>
+  <li><var>nnn</var>[ <code>-submit</code> | ]
+  <li><var>nnn</var><code>-maintonly</code>
+  <li><var>nnn</var><code>-quiet</code>
+  <li><var>nnn</var><code>-forwarded</code>
+  <li><var>nnn</var><code>-request</code>
+  <li><var>nnn</var><code>-submitter</code>
+  <li><var>nnn</var><code>-done</code>
+  <li><var>nnn</var><code>-close</code>
+  <li><var>nnn</var><code>-subscribe</code>
+</ul>  
+
 <hr>
 
 <p>Other pages:
diff --git a/scripts/service.in b/scripts/service.in
index 19e8bb3..19527b1 100755
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -719,13 +719,19 @@ END
 	my $bugnum = $2; my $blockers = $4;
 	$addsub = "add";
 	$addsub = "sub" if ($1 eq "un");
-	
+	if ($bugnum =~ m/^-\d+$/ && defined $clonebugs{$bugnum}) {
+	     $bugnum = $clonebugs{$bugnum};
+	}
+
 	my @okayblockers;
 	my @badblockers;
 	foreach my $b (split /[\s,]+/, $blockers) {
 	    $b=~s/^\#//;
 	    if ($b=~/[0-9]+/) {
 		$ref=$b;
+		if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) {
+		     $ref = $clonebugs{$ref};
+		}
 		if (&getbug) {
 		    push @okayblockers, $b;
 
-- 
2.39.2