From f0760bd3f4614a4d842ab44ae7230a0d78df2784 Mon Sep 17 00:00:00 2001 From: Mason James Date: Wed, 27 Mar 2013 08:20:09 +1300 Subject: [PATCH] Bug 9927 - tweak list-deps script to build a better ./debian/control file Content-Type: text/plain; charset="utf-8" to test... 1/ apply patch 2/ delete existing ./debian.control file rm ./debian.control 3/ run script ./debian.control/update-debian 4/ view new ./debian.control file more ./debian.control --- debian/control | 34 +++++++++++++++++----------------- debian/control.in | 4 +++- debian/list-deps | 5 ++++- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/debian/control b/debian/control index be19e0c..da4fe42 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: libalgorithm-checkdigits-perl, libcache-fastmmap-perl, libcache-memcached-fast-perl, libcache-perl, - libcgi-pm-perl | perl-modules, + libcgi-pm-perl, libcgi-session-driver-memcached-perl, libcgi-session-perl, libcgi-session-serialize-yaml-perl, @@ -37,9 +37,10 @@ Build-Depends: libalgorithm-checkdigits-perl, libdbd-mysql-perl, libdbd-sqlite2-perl, libdbi-perl, - libdigest-sha-perl | perl, + libdigest-sha-perl, libemail-date-perl, - libfile-path-perl | perl-modules, + libfile-path-perl, + libfile-slurp-perl, libgd-barcode-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgraphics-magick-perl, @@ -63,7 +64,7 @@ Build-Depends: libalgorithm-checkdigits-perl, libmime-lite-perl, libmodern-perl-perl, libmodule-bundled-files-perl, - libmodule-load-conditional-perl | perl-modules, + libmodule-load-conditional-perl, libmoose-perl, libmoosex-storage-perl, libmoosex-types-perl, @@ -88,7 +89,7 @@ Build-Depends: libalgorithm-checkdigits-perl, libtemplate-plugin-htmltotext-perl, libtest-deep-perl, libtest-mockmodule-perl, - libtest-simple-perl | perl-modules, + libtest-simple-perl, libtest-strict-perl, libtest-warn-perl, libtest-yaml-valid-perl, @@ -109,11 +110,11 @@ Build-Depends: libalgorithm-checkdigits-perl, libxml-sax-writer-perl, libxml-simple-perl, libyaml-perl, - libyaml-syck-perl, - perl, - perl-modules, + libyaml-syck-perl, debhelper (>= 7.0.50), gettext, python, python-debian, xsltproc, docbook-xsl, - libxml2-utils + libxml2-utils, + perl, + perl-modules Package: koha-common Architecture: all @@ -199,7 +200,7 @@ Depends: libalgorithm-checkdigits-perl, libcache-fastmmap-perl, libcache-memcached-fast-perl, libcache-perl, - libcgi-pm-perl | perl-modules, + libcgi-pm-perl, libcgi-session-driver-memcached-perl, libcgi-session-perl, libcgi-session-serialize-yaml-perl, @@ -220,9 +221,10 @@ Depends: libalgorithm-checkdigits-perl, libdbd-mysql-perl, libdbd-sqlite2-perl, libdbi-perl, - libdigest-sha-perl | perl, + libdigest-sha-perl, libemail-date-perl, - libfile-path-perl | perl-modules, + libfile-path-perl, + libfile-slurp-perl, libgd-barcode-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgraphics-magick-perl, @@ -246,7 +248,7 @@ Depends: libalgorithm-checkdigits-perl, libmime-lite-perl, libmodern-perl-perl, libmodule-bundled-files-perl, - libmodule-load-conditional-perl | perl-modules, + libmodule-load-conditional-perl, libmoose-perl, libmoosex-storage-perl, libmoosex-types-perl, @@ -271,7 +273,7 @@ Depends: libalgorithm-checkdigits-perl, libtemplate-plugin-htmltotext-perl, libtest-deep-perl, libtest-mockmodule-perl, - libtest-simple-perl | perl-modules, + libtest-simple-perl, libtest-strict-perl, libtest-warn-perl, libtest-yaml-valid-perl, @@ -292,9 +294,7 @@ Depends: libalgorithm-checkdigits-perl, libxml-sax-writer-perl, libxml-simple-perl, libyaml-perl, - libyaml-syck-perl, - perl, - perl-modules + libyaml-syck-perl Architecture: all Description: Perl dep. for koha Koha is an Integrated Library Managment system for real-world libraries diff --git a/debian/control.in b/debian/control.in index a30aeed..7ebbee0 100644 --- a/debian/control.in +++ b/debian/control.in @@ -8,7 +8,9 @@ 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, + perl, + perl-modules Package: koha-common Architecture: all diff --git a/debian/list-deps b/debian/list-deps index dcb6fb8..e72f27e 100755 --- a/debian/list-deps +++ b/debian/list-deps @@ -40,10 +40,12 @@ my $prefix = "^/usr/((lib|share)/perl5|(lib|share)/perl/[0-9.]+)"; foreach my $module ( keys %$deps ) { next if $ignore{$module}; + my $ver = $deps->{$module}->{'min_ver'}; my $subpath = $module; $subpath =~ s,::,/,g; my $output = qx(apt-file -l -x search "$prefix/$subpath.pm\$"); + my @temp = split( /\n/, $output ); my @lines = (); @@ -51,10 +53,11 @@ foreach my $module ( keys %$deps ) { # a Debian system. Debian packages should not have unversioned # dependencies on such packages. foreach my $line (@temp) { - if ( $line ne "perl-base" ) { + if ( $line !~ /^perl-base$|^perl-modules$|^perl$/ ) { @lines = ( @lines, $line ); } } + if ( scalar(@lines) == 1 && $lines[0] ne "" ) { my $pkg = $lines[0]; print "$pkg\n"; -- 1.7.2.5