From 8dc5f118832a4aca906239ffed82f72497c37f8e Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 19 Oct 2011 14:53:17 -0700 Subject: perl: upgrade from 5.12.3 to 5.14.2 parallel build fix patches are not needed as they are upstream now. Got a new set of debian patch set for 5.14.2 perl-rpdepends: fix the autogenerated rdepends mistakes take out some mdoules which are not going to be built. [Saul Wold: Remove debug] Signed-off-by: Nitin A Kamble --- .../perl-5.12.3/debian/deprecate-with-apt.diff | 61 ---------------------- 1 file changed, 61 deletions(-) delete mode 100644 meta/recipes-devtools/perl/perl-5.12.3/debian/deprecate-with-apt.diff (limited to 'meta/recipes-devtools/perl/perl-5.12.3/debian/deprecate-with-apt.diff') diff --git a/meta/recipes-devtools/perl/perl-5.12.3/debian/deprecate-with-apt.diff b/meta/recipes-devtools/perl/perl-5.12.3/debian/deprecate-with-apt.diff deleted file mode 100644 index ad0b0cfb8..000000000 --- a/meta/recipes-devtools/perl/perl-5.12.3/debian/deprecate-with-apt.diff +++ /dev/null @@ -1,61 +0,0 @@ -Upstream-Status:Inappropriate [debian patch] - -From: Niko Tyni -Subject: Point users to Debian packages of deprecated core modules -Bug-Debian: http://bugs.debian.org/580034 - -Class::ISA, Switch, Pod::Plainer, and (partially) Shell were -deprecated from the Perl core in 5.12.0. - -To get a clean transition, perl-modules is going to recommend the separate -Debian packages of these for one release cycle so that they will be -pulled in by default on upgrades. - -However, on systems configured to ignore recommendations the deprecation -warnings will still be useful, so modify them slightly to point to the -separate packages instead. - ---- - lib/deprecate.pm | 18 +++++++++++++++++- - 1 files changed, 17 insertions(+), 1 deletions(-) - -diff --git a/lib/deprecate.pm b/lib/deprecate.pm -index 7b92e0b..9db7330 100644 ---- a/lib/deprecate.pm -+++ b/lib/deprecate.pm -@@ -7,6 +7,16 @@ our $VERSION = 0.01; - our %Config; - unless (%Config) { require Config; *Config = \%Config::Config; } - -+# Debian-specific change: recommend the separate Debian packages of -+# deprecated modules where available -+ -+my %DEBIAN_PACKAGES = ( -+ "Class::ISA" => "libclass-isa-perl", -+ "Pod::Plainer" => "libpod-plainer-perl", -+ "Switch" => "libswitch-perl", -+ "Shell" => "libshell-perl", -+); -+ - sub import { - my ($package, $file, $line) = caller; - my $expect_leaf = "$package.pm"; -@@ -44,9 +54,15 @@ EOM - if (defined $callers_bitmask - && (vec($callers_bitmask, $warnings::Offsets{deprecated}, 1) - || vec($callers_bitmask, $warnings::Offsets{all}, 1))) { -- warn <<"EOM"; -+ if (my $deb = $DEBIAN_PACKAGES{$package}) { -+ warn <<"EOM"; -+$package will be removed from the Perl core distribution in the next major release. Please install the separate $deb package. It is being used at $call_file, line $call_line. -+EOM -+ } else { -+ warn <<"EOM"; - $package will be removed from the Perl core distribution in the next major release. Please install it from CPAN. It is being used at $call_file, line $call_line. - EOM -+ } - } - return; - } --- -tg: (a508b62..) debian/deprecate-with-apt (depends on: upstream) -- cgit v1.2.3