From 72f863bf40c9f9482eda6d3a96f0c6718e31a2a4 Mon Sep 17 00:00:00 2001
From: Mason James <mtj@kohaaloha.com>
Date: Fri, 3 Jul 2020 23:42:02 +1200
Subject: [PATCH] Bug 25920: Add liblocale-codes-perl package to fix
ubuntu-stable (focal)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
to test on ubuntu-20...
1/ install koha-common pkg
$ sudo apt install koha-common
2/ confirm liblocale-codes-perl pkg is not installed :(
$ apt-cache policy liblocale-codes-perl | grep Installed
Installed: (none)
3/ apply patch
4/ build and install new koha-common pkg
5/ confirm liblocale-codes-perl pkg is now installed :)
$ apt-cache policy liblocale-codes-perl | grep Installed
Installed: 3.62-1
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>
---
debian/control | 2 ++
debian/list-deps | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index b212ee3387..7dcbd1d54c 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,7 @@ Build-Depends: libalgorithm-checkdigits-perl,
liblingua-stem-snowball-perl,
liblist-moreutils-perl,
liblocale-currency-format-perl,
+ liblocale-codes-perl,
liblocale-po-perl,
liblog-log4perl-perl,
liblwp-protocol-https-perl|libwww-perl (<<6.02), libio-socket-ssl-perl,
@@ -310,6 +311,7 @@ Depends: libalgorithm-checkdigits-perl,
liblingua-stem-perl,
liblingua-stem-snowball-perl,
liblist-moreutils-perl,
+ liblocale-codes-perl,
liblocale-currency-format-perl,
liblocale-po-perl,
liblog-log4perl-perl,
diff --git a/debian/list-deps b/debian/list-deps
index 68f3b60806..dd660fa34d 100755
--- a/debian/list-deps
+++ b/debian/list-deps
@@ -27,12 +27,13 @@ use C4::Installer::PerlModules;
# apt-file can find, e.g. in the Koha repo rather than the regular
# debian one.
my %overrides = (
- 'LWP::Protocol::https' => 'liblwp-protocol-https-perl|libwww-perl (<<6.02), libio-socket-ssl-perl',
+ '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) | libio-socket-ip-perl',
'Swagger2' => 'libswagger2-perl (>= 0.59)',
'Mojolicious' => 'libmojolicious-perl (>= 6.0)',
- 'CPAN::Meta' => 'libcpan-meta-perl (>= 2.150010) | perl-modules-5.28 | perl-modules-5.30 | perl-modules (>= 5.20.2)'
+ 'CPAN::Meta' => 'libcpan-meta-perl (>= 2.150010) | perl-modules-5.28 | perl-modules-5.30 | perl-modules (>= 5.20.2)',
+ 'Locale::Language' => 'liblocale-codes-perl'
);
# These are packages we're going to ignore
--
2.11.0