[libcpan-meta-perl] 01/01: Avoid using new List::Util as it's not available in Debian (see #732191)

[dom at earth.li]

This is an automated email from the git hooks/post-receive script.

dom pushed a commit to branch master
in repository libcpan-meta-perl.

commit d424924d955d4fad4beb1c16dde639ebe761e142
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sat Jan 4 14:28:55 2014 +0000

    Avoid using new List::Util as it's not available in Debian (see #732191)
---
 debian/changelog                          | 11 +++--
 debian/control                            |  2 -
 debian/patches/avoid-new-List-Utils.patch | 73 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 4 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f9776d..0007a5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,14 @@
 libcpan-meta-perl (2.133380-1) UNRELEASED; urgency=medium
 
-  PROBLEM:
-  we need 'libscalar-list-utils-perl (>= 1:1.33) | perl (>= 5.19.5)'
-  but:
-  'perl-base : Conflicts: libscalar-list-utils-perl but 1:1.35-1 is to be installed.'
-  this is #721450
-
+  [ gregor herrmann ]
   * New upstream release.
   * Add (build) dependency on List::Util.
   * Declare compliance with Debian Policy 3.9.5.
 
+  [ Dominic Hargreaves ]
+  * Avoid using new List::Util as it's not available in Debian
+    (see #732191)
+
  -- gregor herrmann <gregoa at debian.org>  Tue, 10 Dec 2013 20:43:00 +0100
 
 libcpan-meta-perl (2.132830-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 17aa534..c4d1f27 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: perl,
-                     libscalar-list-utils-perl (>= 1:1.33) | perl (>= 5.19.5),
                      perl (>= 5.13.9) | libversion-perl (>= 1:0.8800),
                      perl (>= 5.15.0) | libjson-pp-perl,
                      perl (>= 5.17.1) | libcpan-meta-requirements-perl,
@@ -24,7 +23,6 @@ Package: libcpan-meta-perl
 Architecture: all
 Depends: ${misc:Depends},
          ${perl:Depends},
-         libscalar-list-utils-perl (>= 1:1.33) | perl (>= 5.19.5),
          perl (>= 5.15.0) | libjson-pp-perl,
          perl (>= 5.17.1) | libcpan-meta-requirements-perl,
          perl (>= 5.17.1) | libcpan-meta-yaml-perl,
diff --git a/debian/patches/avoid-new-List-Utils.patch b/debian/patches/avoid-new-List-Utils.patch
new file mode 100644
index 0000000..0dc4fd9
--- /dev/null
+++ b/debian/patches/avoid-new-List-Utils.patch
@@ -0,0 +1,73 @@
+From: Dominic Hargreaves <dom at earth.li>
+Date: Sat, 04 Jan 2014 14:25:38 +0000
+Subject: Don't require List::Util 1.33 as this isn't in Debian yet
+
+See <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732191> for more
+details.
+
+Forwarded: not-needed
+
+diff --git a/META.yml b/META.yml
+index 4a0858d..525d832 100644
+--- a/META.yml
++++ b/META.yml
+@@ -11,6 +11,7 @@ build_requires:
+   File::Spec::Functions: 0
+   File::Temp: 0.20
+   IO::Dir: 0
++  List::Util: 0
+   Test::More: 0.88
+   overload: 0
+   utf8: 0
+@@ -59,7 +60,7 @@ requires:
+   CPAN::Meta::YAML: 0.008
+   Carp: 0
+   JSON::PP: 2.27200
+-  List::Util: 1.33
++  List::MoreUtils: 0
+   Parse::CPAN::Meta: 1.4403
+   Scalar::Util: 0
+   perl: 5.008
+diff --git a/Makefile.PL b/Makefile.PL
+index 3b66d3e..cf040f1 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -24,7 +24,7 @@ my %WriteMakefileArgs = (
+     "CPAN::Meta::YAML" => "0.008",
+     "Carp" => 0,
+     "JSON::PP" => "2.27200",
+-    "List::Util" => "1.33",
++    "List::MoreUtils" => 0,
+     "Parse::CPAN::Meta" => "1.4403",
+     "Scalar::Util" => 0,
+     "strict" => 0,
+@@ -40,6 +40,7 @@ my %WriteMakefileArgs = (
+     "File::Temp" => "0.20",
+     "IO::Dir" => 0,
+     "Test::More" => "0.88",
++    "List::Util" => 0,
+     "overload" => 0,
+     "utf8" => 0
+   },
+@@ -62,7 +63,7 @@ my %FallbackPrereqs = (
+   "File::Temp" => "0.20",
+   "IO::Dir" => 0,
+   "JSON::PP" => "2.27200",
+-  "List::Util" => "1.33",
++  "List::MoreUtils" => 0,
+   "Parse::CPAN::Meta" => "1.4403",
+   "Scalar::Util" => 0,
+   "Test::More" => "0.88",
+diff --git a/lib/CPAN/Meta/Converter.pm b/lib/CPAN/Meta/Converter.pm
+index aa8749b..60c9ed1 100644
+--- a/lib/CPAN/Meta/Converter.pm
++++ b/lib/CPAN/Meta/Converter.pm
+@@ -9,7 +9,7 @@ use CPAN::Meta::Validator;
+ use CPAN::Meta::Requirements;
+ use version 0.88 ();
+ use Parse::CPAN::Meta 1.4400 ();
+-use List::Util 1.33 qw/all/;
++use List::MoreUtils qw/all/;
+ 
+ sub _dclone {
+   my $ref = shift;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..75da3f5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+avoid-new-List-Utils.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcpan-meta-perl.git