Merge remote-tracking branch 'origin/master' into database

diff --cc Debbugs/Bugs.pm
index 5ae0afa9faf39e7d4bf238ecfaea78a1f4562451,f8e049ddf6633fd755762a697abda6e9e6ee70f8..095ed763b98dfdc45c0e3433a8b357f5ce54dc1c
--- 1/Debbugs/Bugs.pm
--- 2/Debbugs/Bugs.pm
+++ b/Debbugs/Bugs.pm
@@@ -55,10 -55,10 +55,10 @@@ use Params::Validate qw(validate_with :
  use IO::File;
  use Debbugs::Status qw(splitpackages get_bug_status);
  use Debbugs::Packages qw(getsrcpkgs getpkgsrc);
 -use Debbugs::Common qw(getparsedaddrs package_maintainer getmaintainers make_list);
 +use Debbugs::Common qw(getparsedaddrs package_maintainer getmaintainers make_list hash_slice);
  use Fcntl qw(O_RDONLY);
  use MLDBM qw(DB_File Storable);
- use List::Util qw(first);
+ use List::AllUtils qw(first);
  use Carp;
  
  =head2 get_bugs

diff --cc Debbugs/CGI/Bugreport.pm
Simple merge

diff --cc Debbugs/Common.pm
Simple merge

diff --cc Debbugs/Config.pm
Simple merge

diff --cc Debbugs/Log.pm
Simple merge

diff --cc Debbugs/MIME.pm
Simple merge

diff --cc Debbugs/Packages.pm
Simple merge

diff --cc Debbugs/Status.pm
index 42dc850b10a70a7ee9b2700155fbe41f4520e4d2,4b8d82e828f06687595ea11a45164a4bb907401d..62cba343dce6183553b59ec8fe4976b69a0d10bc
--- 1/Debbugs/Status.pm
--- 2/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@@ -335,8 -318,11 +346,11 @@@ my $ditch_space_unique_and_sort = sub {
  my %split_fields =
      (package        => \&splitpackages,
       affects        => \&splitpackages,
 -     blocks         => $ditch_empty_space,
 -     blockedby      => $ditch_empty_space,
+      # Ideally we won't have to split source, but because some consumers of
+      # get_bug_status cannot handle arrayref, we will split it here.
+      source         => \&splitpackages,
 +     blocks         => $ditch_space_unique_and_sort,
 +     blockedby      => $ditch_space_unique_and_sort,
       # this isn't strictly correct, but we'll split both of them for
       # the time being until we ditch all use of keywords everywhere
       # from the code

diff --cc debian/control
index 19d9da1e8753df763ffd8c3b2435340d4a8ab9ff,7bd59992203d2e2d41890fd48f370c9fbaa42867..6fadd40da5f41eb00e6e26e35aad5ab46d3945ae
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -12,10 -12,10 +12,12 @@@ Build-Depends-Indep: libparams-validate
   liburi-perl, libsoap-lite-perl, libcgi-simple-perl,
   libhttp-server-simple-perl, libtest-www-mechanize-perl,
   libmail-rfc822-address-perl, libsafe-hole-perl, libuser-perl,
-  libconfig-simple-perl, libtest-pod-perl, liblist-moreutils-perl,
-  libtext-template-perl, graphviz,
+  libconfig-simple-perl, libtest-pod-perl, liblist-allutils-perl,
+ # used by Debbugs::Libravatar and libravatar.cgi
+  libfile-libmagic-perl, libgravatar-url-perl, libwww-perl, imagemagick,
 + libdbix-class-perl, libdatetime-format-pg-perl,
-  libdatetime-format-mail-perl
++ libdatetime-format-mail-perl,
+  libtext-template-perl, graphviz, libtext-iconv-perl
  Homepage: http://wiki.debian.org/Teams/Debbugs
  
  Package: debbugs