[pkg-bioc] svn commit r319 r319 - /trunk/tools-ng/pkgbioc.pm
psychedelys-guest at users.alioth.debian.org
psychedelys-guest at users.alioth.debian.org
Mon Sep 24 16:22:18 UTC 2007
Author: psychedelys-guest
Date: Mon Sep 24 16:22:18 2007
New Revision: 319
URL: http://svn.debian.org/wsvn/pkg-bioc/?sc=1&rev=319
Log:
need to have the debiandepencies also in debianbuilddepencies, if not hte Builder do not put them in the chroot, and the build is failling
Modified:
trunk/tools-ng/pkgbioc.pm
Modified: trunk/tools-ng/pkgbioc.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/pkgbioc.pm?rev=319&op=diff
==============================================================================
--- trunk/tools-ng/pkgbioc.pm (original)
+++ trunk/tools-ng/pkgbioc.pm Mon Sep 24 16:22:18 2007
@@ -513,6 +512,7 @@ sub descriptionfile ($$$) {
# From a list of dependencies, add a given package to the right
# (build or not) dependencies.
+# TODO need to reread it with a cold head.
sub adddependencies ($$$$$$) {
my ( $package, $dependsline, $packagehashref, $repoof, $global,
$manuallycurated )
@@ -564,11 +564,25 @@ sub adddependencies ($$$$$$) {
)
unless grep( /\br-recommended\b/i,
@{ $packagehashref->{debiandependencies} } );
+ push(
+ @{ $packagehashref->{debianbuilddependencies} },
+ "r-recommended"
+ )
+ unless grep( /\br-recommended\b/i,
+ @{ $packagehashref->{debianbuilddependencies} } );
+
}
elsif ( $global->{AlreadyinDebian}->{$pkg} =~ "vrlibs" ) {
push( @{ $packagehashref->{debiandependencies} }, "r-cran-vr" )
unless grep( /\br-cran-vr\b/i,
@{ $packagehashref->{debiandependencies} } );
+ push(
+ @{ $packagehashref->{debianbuilddependencies} },
+ "r-cran-vr"
+ )
+ unless grep( /\br-cran-vr\b/i,
+ @{ $packagehashref->{debianbuilddependencies} } );
+
}
elsif ( $global->{AlreadyinDebian}->{$pkg} =~ "gregmisc" ) {
push(
@@ -577,6 +591,13 @@ sub adddependencies ($$$$$$) {
)
unless grep( /\br-cran-gregmisc\b/i,
@{ $packagehashref->{debiandependencies} } );
+ push(
+ @{ $packagehashref->{debianbuilddependencies} },
+ "r-cran-gregmisc"
+ )
+ unless grep( /\br-cran-gregmisc\b/i,
+ @{ $packagehashref->{debianbuilddependencies} } );
+
}
elsif ( $global->{AlreadyinDebian}->{$pkg} =~ "ignore" ) {
}
@@ -586,6 +607,10 @@ sub adddependencies ($$$$$$) {
push( @{ $packagehashref->{debiandependencies} }, $newpkg )
unless
grep( /\b$pkg\b/i, @{ $packagehashref->{debiandependencies} } );
+ push( @{ $packagehashref->{debianbuilddependencies} }, $newpkg )
+ unless grep( /\b$pkg\b/i,
+ @{ $packagehashref->{debianbuilddependencies} } );
+
}
elsif ( $pkg =~ /^r-(cran|bioc|omegahat)-(.*)/m ) {
@@ -628,6 +653,10 @@ sub adddependencies ($$$$$$) {
push( @{ $packagehashref->{debiandependencies} }, $newpkg )
unless
grep( $newpkg, @{ $packagehashref->{debiandependencies} } );
+ push( @{ $packagehashref->{debianbuilddependencies} }, $newpkg )
+ unless grep( $newpkg,
+ @{ $packagehashref->{debianbuilddependencies} } );
+
}
else {
if ($manuallycurated) {
@@ -665,6 +694,9 @@ sub adddependencies ($$$$$$) {
push( @{ $packagehashref->{debiandependencies} }, $pkg )
unless grep( /\b$backslashpkg\b/i,
@{ $packagehashref->{debiandependencies} } );
+ push( @{ $packagehashref->{debianbuilddependencies} }, $pkg )
+ unless grep( /\b$backslashpkg\b/i,
+ @{ $packagehashref->{debianbuilddependencies} } );
}
else {
@@ -676,6 +708,9 @@ sub adddependencies ($$$$$$) {
@{ $packagehashref->{debiandependencies} } )
or grep( /\b$backslashpkg\b/i,
@{ $packagehashref->{debianbuilddependencies} } );
+ push( @{ $packagehashref->{debianbuildependencies} }, $pkg )
+ unless grep( /\b$backslashpkg\b/i,
+ @{ $packagehashref->{debianbuilddependencies} } );
print STDERR
"in manually curated builddependencies for $package\n";
@@ -972,6 +1007,8 @@ sub loadDescriptionsForPackage($$$$$$$)
if ( exists $global->{buildDeps}->{$package} ) {
my $dependsline = join( ",", @{ $global->{buildDeps}->{$package} } );
+
+ # TODO shouldn't the buildDeps only populate the debianbuilddependencies ?
adddependencies( $package, $dependsline, $packagehashref, $repoof,
$global, 1 );
@@ -985,6 +1022,8 @@ sub loadDescriptionsForPackage($$$$$$$)
# TODO Need to be import after the description stuff.
if ( exists $global->{externalDeps}->{$package} ) {
my $dependsline = join( ",", @{ $global->{externalDeps}->{$package} } );
+
+ # TODO shouldn't the buildDeps only populate the debiandependencies ?
adddependencies( $package, $dependsline, $packagehashref, $repoof,
$global, 1 );
}
More information about the pkg-bioc-devel
mailing list