Attachment 54226 Details for Bug 16643 – Bug 16643 - Make debian/list-deps aware of Jessie folder structure

[patch] Bug 16643 - Make debian/list-deps aware of Jessie folder structure

Bug-16643---Make-debianlist-deps-aware-of-Jessie-f.patch (text/plain), 1.24 KB, created by Mirko Tietgen on 2016-08-09 16:09:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mirko Tietgen

Created: 2016-08-09 16:09:25 UTC

Size: 1.24 KB

patch

obsolete

>From 2a1641257d6282391d7f692e5fe644c842ce4eeb Mon Sep 17 00:00:00 2001
>From: Mirko Tietgen <mirko@abunchofthings.net>
>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..c08b87d 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

Actions: View | Diff | Splinter Review

Attachments on bug 16643: 52028 | 54224 | 54226