From c34a6970685c7e8fda1f47c01cd3f91fc29c7005 Mon Sep 17 00:00:00 2001 From: Mirko Tietgen Date: Sat, 4 Jun 2016 09:44:14 +0200 Subject: [PATCH] Bug 16643 - Make debian/list-deps aware of Jessie folder structure the old regex did not match the new folder structure Rebased to depend on bug 17043 --- debian/list-deps | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/list-deps b/debian/list-deps index 89415c5..3592e07 100755 --- a/debian/list-deps +++ b/debian/list-deps @@ -40,7 +40,17 @@ my %ignore = ( my $deps = $C4::Installer::PerlDependencies::PERL_DEPS; -my $prefix = "^/usr/((lib|share)/perl5|(lib|share)/perl/[0-9.]+|(lib|share)/.*-linux-gnu.*/perl/[0-9.]+|(lib|share)/.*-linux-gnu.*/perl5/[0-9.]+)"; + +# for $prefix we need to match different folder structures depending on +# distribution and perl version +# +# examples that the following regex needs to match: +# /usr/lib/x86_64-linux-gnu/perl/5.20.2/POSIX.pm +# /usr/lib/perl/5.14.2/POSIX.pm +# /usr/lib/perl5/POSIX.pm +# /usr/lib/x86_64-linux-gnu/perl5/5.20/YAML/Syck.pm + +my $prefix = "^/usr/((lib|share)/(.*-linux-gnu/)?perl5?/?[0-9.]+)?"; foreach my $module ( keys %$deps ) { next if $ignore{$module}; -- 2.1.4