From 7736421344e21fe1f990e8c70fe457957ac7a4c1 Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Tue, 13 May 2014 11:12:53 +1200 Subject: [PATCH] Bug 12234 - dependency changes to allow master to build A run of update-control, adding bash-completion as a build-time dependency, allowing update-control to ignore anything that doesn't have a package but isn't marked as "required" by Koha, addeda dependencies that we don't use but is needed by something we do use. All fairly mundane. --- C4/Installer/PerlDependencies.pm | 13 +++++++++++++ debian/control | 12 +++++++++++- debian/control.in | 2 +- debian/list-deps | 3 +++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm index f1ddee3..eb4685d 100644 --- a/C4/Installer/PerlDependencies.pm +++ b/C4/Installer/PerlDependencies.pm @@ -194,6 +194,19 @@ our $PERL_DEPS = { 'required' => '1', 'min_ver' => '0.33' }, + 'Text::PDF' => { + 'usage' => 'Core', + 'required' => '1', + 'min_ver' => '0.33', + # We don't use this directly, but it's not a required dependency for + # PDF::Reuse however we need it via that or tests fail. + }, + 'Font::TTF' => { + 'usage' => 'Core', + 'required' => '1', + 'min_ver' => '0.33', + # Also needed for our use of PDF::Reuse + }, 'DateTime' => { 'usage' => 'Core', 'required' => '1', diff --git a/debian/control b/debian/control index 16977d6..e2bd024 100644 --- a/debian/control +++ b/debian/control @@ -47,6 +47,7 @@ Build-Depends: libalgorithm-checkdigits-perl, libemail-valid-perl, libfile-path-perl | perl-modules, libfile-slurp-perl, + libfont-ttf-perl, libgd-barcode-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgraphics-magick-perl, @@ -61,6 +62,7 @@ Build-Depends: libalgorithm-checkdigits-perl, liblingua-stem-snowball-perl, liblist-moreutils-perl, liblocale-currency-format-perl, + liblocale-maketext-lexicon-perl, liblocale-po-perl, libmail-sendmail-perl, libmarc-charset-perl, @@ -79,6 +81,7 @@ Build-Depends: libalgorithm-checkdigits-perl, libnet-server-perl, libnet-z3950-zoom-perl, libnumber-format-perl, + libopenoffice-oodoc-perl, libpdf-api2-perl, libpdf-api2-simple-perl, libpdf-reuse-barcode-perl, @@ -104,6 +107,7 @@ Build-Depends: libalgorithm-checkdigits-perl, libtext-csv-perl, libtext-csv-xs-perl, libtext-iconv-perl, + libtext-pdf-perl, libtext-unaccent-perl, libtime-progress-perl, libuniversal-require-perl, @@ -121,7 +125,7 @@ Build-Depends: libalgorithm-checkdigits-perl, perl, perl-modules, debhelper (>= 7.0.50), gettext, python, python-debian, xsltproc, docbook-xsl, - libxml2-utils + libxml2-utils, bash-completion Package: koha-common Architecture: all @@ -129,6 +133,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, apache2, apache2-mpm-itk, at, + cron-daemon, daemon, debconf, idzebra-2.0, @@ -176,6 +181,7 @@ Depends: ${misc:Depends}, apache2, apache2-mpm-itk, at, + cron-daemon, daemon, debconf, idzebra-2.0, @@ -238,6 +244,7 @@ Depends: libalgorithm-checkdigits-perl, libemail-valid-perl, libfile-path-perl | perl-modules, libfile-slurp-perl, + libfont-ttf-perl, libgd-barcode-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgraphics-magick-perl, @@ -252,6 +259,7 @@ Depends: libalgorithm-checkdigits-perl, liblingua-stem-snowball-perl, liblist-moreutils-perl, liblocale-currency-format-perl, + liblocale-maketext-lexicon-perl, liblocale-po-perl, libmail-sendmail-perl, libmarc-charset-perl, @@ -270,6 +278,7 @@ Depends: libalgorithm-checkdigits-perl, libnet-server-perl, libnet-z3950-zoom-perl, libnumber-format-perl, + libopenoffice-oodoc-perl, libpdf-api2-perl, libpdf-api2-simple-perl, libpdf-reuse-barcode-perl, @@ -295,6 +304,7 @@ Depends: libalgorithm-checkdigits-perl, libtext-csv-perl, libtext-csv-xs-perl, libtext-iconv-perl, + libtext-pdf-perl, libtext-unaccent-perl, libtime-progress-perl, libuniversal-require-perl, diff --git a/debian/control.in b/debian/control.in index bd34fcb..8984c6b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.8.4 # There are some exceptions. Build-Depends:__AUTODEPENDS__, debhelper (>= 7.0.50), gettext, python, python-debian, xsltproc, docbook-xsl, - libxml2-utils + libxml2-utils, bash-completion Package: koha-common Architecture: all diff --git a/debian/list-deps b/debian/list-deps index dcb6fb8..8d50164 100755 --- a/debian/list-deps +++ b/debian/list-deps @@ -83,6 +83,9 @@ foreach my $module ( keys %$deps ) { elsif ( exists $overrides{$module} ) { print "$overrides{$module}\n"; } + elsif ( ! $deps->{$module}->{'required'} ) { + # Ignore because we don't have it and we don't care. + } else { print "EEEK: unknown package for $module\n"; } -- 1.8.3.2