merge changes from dla source

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 5fdba0650304707f64db1103e13ffb01bd03978d..27dadb8fd37431c800aa58c3a32571b9d5ec93c2 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -440,7 +440,7 @@ sub set_blocks {
        push @changed, 'removed blocking bug(s) of '.$data->{bug_num}.': '.english_join([keys %removed_blockers]) if keys %removed_blockers;
        $action = ucfirst(join ('; ',@changed)) if @changed;
        if (not @changed) {
-           print {$transcript} "Ignoring request to alter tags of bug #$data->{bug_num} to the same tags previously set\n"
+           print {$transcript} "Ignoring request to alter blocking bugs of bug #$data->{bug_num} to the same blocks previously set\n"
                unless __internal_request();
            next;
        }

diff --git a/bin/local-debbugs b/bin/local-debbugs
index acdfa2eb6b47e90877a4dfa48cf3d5a339ec718a..cae7203285e34716000c9f2fde7bcf9d85df9442 100755 (executable)
--- a/bin/local-debbugs
+++ b/bin/local-debbugs
@@ -39,19 +39,19 @@ Update the local mirror of debbugs bugs
 =item B<--daemon, -D>
 
 Start up the daemon on the configured local port to serve bugs which
-have been previously retried
+have been previously retrieved.
 
 =item B<--search, -S>
 
 Cause the running daemon to show the pkgreport.cgi page corresponding
-to the search by invoking sensible-browser and an appropriate url
+to the search by invoking sensible-browser and an appropriate url.
 
 =item B<--show, -s>
 
 Cause the running daemon to show the bugreport.cgi page corresponding
-to the bug by invoking sensible-browser and an appropriate url
+to the bug by invoking sensible-browser and an appropriate url.
 
-=item B<--port,-p>
+=item B<--port, -p>
 
 The port that the daemon is running on (or will be running on.)
 
@@ -65,7 +65,7 @@ Defaults to ~/.debbugs/bugs_to_get
 
 =item B<--bug-site>
 
-Hostname for a site which is running a debbugs install
+Hostname for a site which is running a debbugs install.
 Defaults to bugs.debian.org
 
 =item B<--bug-mirror>
@@ -76,7 +76,7 @@ Defaults to bugs-mirror.debian.org
 
 =item B<--debug, -d>
 
-Debug verbosity. (Default 0)
+Debug verbosity.
 
 =item B<--help, -h>
 
@@ -90,6 +90,21 @@ Display this manual.
 
 =head1 EXAMPLES
 
+=over
+
+=item Update the local mirror
+
+ local-debbugs --mirror
+
+=item Start up the local-debbugs daemon
+
+ local-debbugs --daemon
+
+=item Search for bugs with severity serious
+
+ local-debbugs --search severity:serious
+
+=back
 
 =cut
 

diff --git a/debian/control b/debian/control
index 3307a3e1611cdb51f9750c506c0f7638e9a6102a..9ac9c3b6c31f326181aa247254db208429d9d048 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@ Description: web scripts for the active Debian BTS
 Package: debbugs-local
 Architecture: all
 Depends: libdebbugs-perl, debbugs-web, libconfig-simple-perl,
- libuser-perl, rsync
+ libuser-perl, rsync, libhttp-server-simple-perl
 Description: run and maintains a local mirror of the Debian BTS
  Debian has a bug tracking system which files details of bugs reported
  by users and developers. Each bug is given a number, and is kept on

diff --git a/scripts/process b/scripts/process
index 9cbd85c8147730b181a7488a6f0ca73b1c4f9a29..4d89eecaeaa4507713e0c79a8efe423be4c20fe0 100755 (executable)
--- a/scripts/process
+++ b/scripts/process
@@ -722,7 +722,7 @@ if (length($resentccval)) {
 my $common_headers='';
 {
     local $a = 0;
-    $common_headers=map {$_.($a++%2?': ':"\n")} @common_headers;
+    $common_headers = join('',map {$_.($a++%2?': ':"\n")} @common_headers);
 }
 if ($codeletter eq 'U') { # sent to -submitter
     &htmllog("Message", "sent on", $data->{originator}, "$gBug#$ref.");