Attachment 105397 Details for Bug 25591 – Bug 25591: Update list-deps for Debian 10 and Ubuntu 20.04

[patch] Bug 25591: Update list-deps for Debian 10 and Ubuntu 20.04

Bug-25591-Update-list-deps-for-Debian-10-and-Ubunt.patch (text/plain), 2.56 KB, created by Tomás Cohen Arazi (tcohen) on 2020-05-27 14:25:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2020-05-27 14:25:40 UTC

Size: 2.56 KB

patch

obsolete

>From d19964d9399f29e0ddaf2034360b1cbc0757e217 Mon Sep 17 00:00:00 2001
>From: Mason James <mtj@kohaaloha.com>
>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 <martin.renvoize@ptfs-europe.com>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> debian/list-deps | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/debian/list-deps b/debian/list-deps
>index c9868d2b2d6..ee53d8be123 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.26.2

Actions: View | Diff | Splinter Review

Attachments on bug 25591: 105280 | 105282 | 105310 | 105311 | 105312 | 105326 | 105334 | 105335 | 105336 | 105337 | 105338 | 105339 | 105340 | 105397 | 105408 | 105450