From 89ebb9d8240a4cd557ac9b9b29602b2c45015761 Mon Sep 17 00:00:00 2001 From: Mirko Tietgen Date: Fri, 26 Aug 2016 10:50:18 +0200 Subject: [PATCH] 3.22.10 debian control fixes for debian package This is what went into the 3.22.10 package, should go in 3.22.11 https://bugs.koha-community.org/show_bug.cgi?id=16788 --- C4/Installer/PerlDependencies.pm | 5 +++++ debian/control | 16 +++++++++++++--- debian/list-deps | 1 + 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm index def3c93..875200b 100644 --- a/C4/Installer/PerlDependencies.pm +++ b/C4/Installer/PerlDependencies.pm @@ -797,6 +797,11 @@ our $PERL_DEPS = { required => 1, min_ver => '3.69', # same for Wheezy/Jessie }, + 'IO::Socket::IP' => { + 'usage' => 'Rest API', + 'required' => '0', + 'min_ver' => '0.16' + }, }; 1; diff --git a/debian/control b/debian/control index a6ed510..cd55d54 100644 --- a/debian/control +++ b/debian/control @@ -55,12 +55,14 @@ Build-Depends: libalgorithm-checkdigits-perl, libgraphics-magick-perl, libgravatar-url-perl, libhtml-format-perl, + libhtml-parser-perl, libhtml-scrubber-perl, libhttp-cookies-perl, libhttp-message-perl, libhttp-oai-perl, libjson-perl, liblibrary-callnumber-lc-perl, + liblingua-ispell-perl, liblingua-stem-perl, liblingua-stem-snowball-perl, liblist-moreutils-perl, @@ -118,6 +120,8 @@ Build-Depends: libalgorithm-checkdigits-perl, libtext-iconv-perl, libtext-pdf-perl, libtext-unaccent-perl, + libtime-fake-perl, + libuniversal-can-perl, libuniversal-require-perl, liburi-perl, libuuid-perl, @@ -134,6 +138,7 @@ Build-Depends: libalgorithm-checkdigits-perl, libyaml-syck-perl, perl, perl-modules, + perl-modules (>= 5.20.0) | libio-socket-ip-perl, debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, libxml2-utils, bash-completion, perl-modules (>= 5.14.2) | libtest-simple-perl (>= 0.98) @@ -141,7 +146,7 @@ Package: koha-common Architecture: all Depends: ${misc:Depends}, ${koha:Depends}, apache2, - apache2-mpm-itk, + apache2-mpm-itk | libapache2-mpm-itk, at, cron-daemon, daemon, @@ -189,7 +194,7 @@ Description: integrated (physical) library management system Package: koha-deps Depends: ${misc:Depends}, apache2, - apache2-mpm-itk, + apache2-mpm-itk | libapache2-mpm-itk, at, cron-daemon, daemon, @@ -262,12 +267,14 @@ Depends: libalgorithm-checkdigits-perl, libgraphics-magick-perl, libgravatar-url-perl, libhtml-format-perl, + libhtml-parser-perl, libhtml-scrubber-perl, libhttp-cookies-perl, libhttp-message-perl, libhttp-oai-perl, libjson-perl, liblibrary-callnumber-lc-perl, + liblingua-ispell-perl, liblingua-stem-perl, liblingua-stem-snowball-perl, liblist-moreutils-perl, @@ -325,6 +332,8 @@ Depends: libalgorithm-checkdigits-perl, libtext-iconv-perl, libtext-pdf-perl, libtext-unaccent-perl, + libtime-fake-perl, + libuniversal-can-perl, libuniversal-require-perl, liburi-perl, libuuid-perl, @@ -340,7 +349,8 @@ Depends: libalgorithm-checkdigits-perl, libyaml-perl, libyaml-syck-perl, perl, - perl-modules + perl-modules, + perl-modules (>= 5.20.0) | libio-socket-ip-perl Architecture: all Description: Perl dep. for koha Koha is an Integrated Library Management system for real-world libraries diff --git a/debian/list-deps b/debian/list-deps index f12d088..d1165fd 100755 --- a/debian/list-deps +++ b/debian/list-deps @@ -27,6 +27,7 @@ use C4::Installer::PerlDependencies; # debian one. my %overrides = ( 'LWP::Protocol::https' => 'liblwp-protocol-https-perl|libwww-perl (<6.02), libio-socket-ssl-perl', + 'IO::Socket::IP' => 'perl-modules (>= 5.20.0) | libio-socket-ip-perl', ); # These are packages we're going to ignore -- 2.8.1