From 022384e4c4e6c936709edab1b52055b535926ad2 Mon Sep 17 00:00:00 2001 From: Mason James Date: Sun, 24 May 2020 15:16:20 +1200 Subject: [PATCH] Bug 25591 - Update list-deps for Debian 10 and Ubuntu 20.04 This patch removes version-specific packages from the debian/control file, which fixes a bug where koha-common can only be installed on the debian version that the package was built on Signed-off-by: Martin Renvoize --- debian/list-deps | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/list-deps b/debian/list-deps index c9868d2b2d..ee53d8be12 100755 --- a/debian/list-deps +++ b/debian/list-deps @@ -27,7 +27,7 @@ use C4::Installer::PerlModules; my %overrides = ( 'LWP::Protocol::https' => 'liblwp-protocol-https-perl|libwww-perl (<<6.02), libio-socket-ssl-perl', 'HTTP::OAI' => 'libhttp-oai-perl (>= 3.2) | libhttp-oai-3.27-perl, libhttp-oai-perl (<< 4.0) | libhttp-oai-3.27-perl', - 'IO::Socket::IP' => 'perl-modules (>= 5.20.0) | perl-modules-5.22 | perl-modules-5.24 | libio-socket-ip-perl', + 'IO::Socket::IP' => 'perl-modules (>= 5.20.0) | libio-socket-ip-perl', 'Swagger2' => 'libswagger2-perl (>= 0.59)', 'Mojolicious' => 'libmojolicious-perl (>= 6.0)', ); @@ -57,11 +57,16 @@ foreach my $phase ($prereqs->phases) { # Remove packages that are required/essential and always installed on # a Debian system. Debian packages should not have unversioned # dependencies on such packages. + + + # skip perl-base and problematic version specific libperl* and + # perl-module* packages (they get installed as deps. anyway) foreach my $line (@temp) { - if ( $line ne "perl-base" ) { + if ( $line ne "perl-base" and $line !~ /^libperl5\./ and $line !~ /^perl-modules-5\./ ) { @lines = ( @lines, $line ); } } + if ( exists $overrides{$module} ) { print "$overrides{$module}\n"; } @@ -73,8 +78,6 @@ foreach my $phase ($prereqs->phases) { foreach my $pkg (@lines) { print " | " if ( $pkg ne $lines[0] ); print "$pkg"; - print " | $pkg" . "-5.22" if ( $pkg eq "perl-modules" ); - print " | $pkg" . "-5.24" if ( $pkg eq "perl-modules" ); } print "\n"; } -- 2.20.1