From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 5 Aug 2017 19:27:14 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into database
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=0c2305d4c89d165140bc955a50f3248c9c9ba7ad

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

0c2305d4c89d165140bc955a50f3248c9c9ba7ad
diff --cc Debbugs/Bugs.pm
index 5ae0afa,f8e049d..095ed76
--- a/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/Status.pm
index 42dc850,4b8d82e..62cba34
--- a/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,
+      # 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_empty_space,
 -     blockedby      => $ditch_empty_space,
 +     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 19d9da1,7bd5999..6fadd40
--- a/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