* merge in changes to fix blocking bugs

diff --git a/debian/changelog b/debian/changelog
index 5fbd4b180876f29f4ca805c6b122d0360925c7f4..113b733fb8414c118eb83f953ddf3ab092f8642e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -115,6 +115,9 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Add X-$gProject-PR-Source: line (closes: #219230)
     - Use the %cats data structure properly in pkgreport.cgi
       (closes: #367514)  
+    - Document nnn.*@foobar addresses (closes: #188670)
+    - Support cloned bugs in control blocking (closes: #337329)
+    - Indicate which bugs are blocked after blocking (closes: #367496)
   
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100

diff --git a/scripts/service.in b/scripts/service.in
index 19e8bb31e74eafcaed3ce197ece2085361816942..fdf1fa808b07be3b9ec621aa1a75eb6c400eb3ed 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -762,11 +762,11 @@ END
                &transcript("Was blocked by: $data->{blockedby}\n");
            }
            if ($addsub eq "set") {
-               $action= "Blocking bugs set to: " . join(", ", @okayblockers);
+               $action= "Blocking bugs of $bugnum set to: " . join(", ", @okayblockers);
            } elsif ($addsub eq "add") {
-               $action= "Blocking bugs added: " . join(", ", @okayblockers);
+               $action= "Blocking bugs of $bugnum added: " . join(", ", @okayblockers);
            } elsif ($addsub eq "sub") {
-               $action= "Blocking bugs removed: " . join(", ", @okayblockers);
+               $action= "Blocking bugs of $bugnum removed: " . join(", ", @okayblockers);
            }
            my %removedblocks;
            my %addedblocks;