Use List::AllUtils instead of List::Utils and List::MoreUtils

Because some commands have migrated from List::MoreUtils and List::Utils at
different times, we would have to run slightly different code in unstable,
stable, and oldstable. List::AllUtils wraps around this madness so we don't have
to think about it.

diff --git a/.travis.yml b/.travis.yml
index 207aaaa4f721bfa2b1fc260983dd762bfee3bb09..4eed5cb3fd5a207dceab773cb9cec766dcdd0b82 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ before_install:
     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
+    liblist-allutils-perl libtext-template-perl graphviz
     libfile-libmagic-perl libgravatar-url-perl libwww-perl imagemagick
 script:
   - make; make test

diff --git a/Debbugs/Bugs.pm b/Debbugs/Bugs.pm
index e678aff43c1274e339e8e6d38c3d03e172a578e7..f8e049ddf6633fd755762a697abda6e9e6ee70f8 100644 (file)
--- a/Debbugs/Bugs.pm
+++ b/Debbugs/Bugs.pm
@@ -58,7 +58,7 @@ use Debbugs::Packages qw(getsrcpkgs getpkgsrc);
 use Debbugs::Common qw(getparsedaddrs package_maintainer getmaintainers make_list);
 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 --git a/Debbugs/CGI.pm b/Debbugs/CGI.pm
index 9cc4d512426310e48b15f048722834ac34f7b160..c70f6829483e0a020b1f042c740384f2ddbd4c04 100644 (file)
--- a/Debbugs/CGI.pm
+++ b/Debbugs/CGI.pm
@@ -49,7 +49,7 @@ use Mail::Address;
 use POSIX qw(ceil);
 use Storable qw(dclone);
 
-use List::Util qw(max);
+use List::AllUtils qw(max);
 use File::stat;
 use Digest::MD5 qw(md5_hex);
 use Carp;

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index 02b019729485df69ef8d5c84388664abfed84524..0fd134a2ed20e311ff6ef8c3fa7f049d1f397aa4 100644 (file)
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -45,7 +45,7 @@ use POSIX qw(strftime);
 use Encode qw(decode_utf8 encode_utf8);
 use URI::Escape qw(uri_escape_utf8);
 use Scalar::Util qw(blessed);
-use List::Util qw(sum);
+use List::AllUtils qw(sum);
 use File::Temp;
 
 BEGIN{

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index aaa8925a0adfedf8f33ab86be49d9e5a35f28d08..807549f9a8a574b7595e15bf1a7d5eccea549b3b 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -134,7 +134,7 @@ use Mail::RFC822::Address qw();
 use POSIX qw(strftime);
 
 use Storable qw(dclone nfreeze);
-use List::Util qw(first max);
+use List::AllUtils qw(first max);
 use Encode qw(encode_utf8);
 
 use Carp;

diff --git a/Debbugs/Control/Service.pm b/Debbugs/Control/Service.pm
index 32e1f9730fadd18c76c025d4f9a321323950efda..52d7d10dab6f14aa3794c42a8dde0e728140ebef 100644 (file)
--- a/Debbugs/Control/Service.pm
+++ b/Debbugs/Control/Service.pm
@@ -94,7 +94,7 @@ use Debbugs::Common qw(cleanup_eval_fail);
 use Debbugs::Control qw(:all);
 use Debbugs::Status qw(splitpackages);
 use Params::Validate qw(:types validate_with);
-use List::Util qw(first);
+use List::AllUtils qw(first);
 
 my $bug_num_re = '-?\d+';
 my %control_grammar =

diff --git a/Debbugs/MIME.pm b/Debbugs/MIME.pm
index f114c680ba1a5b1d42639f71ce726d5a83b41a6d..1d8fcb57e2a3c633e8cf86d2bab484ca9c0e5f04 100644 (file)
--- a/Debbugs/MIME.pm
+++ b/Debbugs/MIME.pm
@@ -54,7 +54,7 @@ use File::Temp qw(tempdir);
 use MIME::Parser;
 
 use POSIX qw(strftime);
-use List::MoreUtils qw(apply);
+use List::AllUtils qw(apply);
 
 # for convert_to_utf8
 use Debbugs::UTF8 qw(convert_to_utf8);

diff --git a/Debbugs/Packages.pm b/Debbugs/Packages.pm
index c7fd47c18b6f5dde189a563fe8e61ad2e8955a6e..27117aba47c3b50bc9738e530bd0b1022544e1b8 100644 (file)
--- a/Debbugs/Packages.pm
+++ b/Debbugs/Packages.pm
@@ -39,7 +39,7 @@ use Storable qw(dclone);
 use Params::Validate qw(validate_with :types);
 use Debbugs::Common qw(make_list globify_scalar sort_versions);
 
-use List::Util qw(min max);
+use List::AllUtils qw(min max);
 
 use IO::File;
 

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index 6fe1c1a7a290544c479603f98f3d636fef2f6c59..c9f5709265d9ee3f4cc7be86614def9e34e954de 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -49,7 +49,7 @@ use File::Copy qw(copy);
 use Encode qw(decode encode is_utf8);
 
 use Storable qw(dclone);
-use List::Util qw(min max);
+use List::AllUtils qw(min max);
 
 use Carp qw(croak);
 

diff --git a/Debbugs/User.pm b/Debbugs/User.pm
index c25b35aa9506754a4d946146a27a87d613cd2052..2457e54c4e5d51633794b909c2f18f0e2f9da004 100644 (file)
--- a/Debbugs/User.pm
+++ b/Debbugs/User.pm
@@ -86,7 +86,7 @@ use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
 use Exporter qw(import);
 
 use Debbugs::Config qw(:config);
-use List::Util qw(min);
+use List::AllUtils qw(min);
 
 use Carp;
 use IO::File;

diff --git a/Makefile.PL b/Makefile.PL
index 142f84ae8f30156a63e33d030919c65663ba62b4..1593964f0def945579d035b2614ab4858218a553 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -34,8 +34,7 @@ WriteMakefile(FIRST_MAKEFILE => 'Makefile.perl',
                             'IPC::Open3' => 0,
                             'IPC::Run' => 0,
                             'Libravatar::URL' => 0,
-                            'List::MoreUtils' => 0,
-                            'List::Util' => 0,
+                            'List::AllUtils' => 0,
                             'LWP::UserAgent' => 0,
                             'Mail::Address' => 0,
                             'Mail::CrossAssassin' => 0,

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 5f88e18e6fc2023701b1f6f6f6a1a64a37a4485a..dcf3e36fd2ea82326b947f39b3ec6ba709e1bc74 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -30,7 +30,7 @@ use Scalar::Util qw(looks_like_number);
 
 use Debbugs::Text qw(:templates);
 
-use List::Util qw(max);
+use List::AllUtils qw(max);
 
 
 use CGI::Simple;

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index a0d7685d73f28ba72220d68254b98b657d094ed5..abf739dec4c544f55dcfebb88b3c99d8ad78f245 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -20,7 +20,7 @@ BEGIN{
 
 binmode(STDOUT,':encoding(UTF-8)');
 use POSIX qw(strftime nice);
-use List::Util qw(uniq);
+use List::AllUtils qw(uniq);
 
 use Debbugs::Config qw(:globals :text :config);
 

diff --git a/debian/control b/debian/control
index 3ffe4e79fd8f3ce6f8be8c0f1685418a1f0ebffc..1105a493a9a1890c747601d73cfd26d1851a3338 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends-Indep: libparams-validate-perl,
  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,
+ libconfig-simple-perl, libtest-pod-perl, liblist-alltils-perl,
  # used by Debbugs::Libravatar and libravatar.cgi
  libfile-libmagic-perl, libgravatar-url-perl, libwww-perl, imagemagick,
  libtext-template-perl, graphviz

diff --git a/scripts/gen-indices b/scripts/gen-indices
index 7a8670d96ffb8c69fe90e73185e78a156792183b..1f0e7dfc9b75bf6c999df837a3c0615440cb5af5 100755 (executable)
--- a/scripts/gen-indices
+++ b/scripts/gen-indices
@@ -18,7 +18,7 @@ use Getopt::Long;
 use Pod::Usage;
 
 use File::stat;
-use List::Util qw(min);
+use List::AllUtils qw(min);
 
 use Debbugs::Common qw(make_list);
 

diff --git a/scripts/service b/scripts/service
index 0059ef76df79bd1d5811163611bcc2219d7d6134..0196e266d3e17da5a242d8b9b3f2efd4989704e3 100755 (executable)
--- a/scripts/service
+++ b/scripts/service
@@ -40,7 +40,7 @@ use Debbugs::Text qw(:templates);
 
 use Scalar::Util qw(looks_like_number);
 
-use List::Util qw(first);
+use List::AllUtils qw(first);
 
 use Mail::RFC822::Address;
 use Encode qw(decode encode);