X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2FR%2Fdebcontrol.R;h=da13e332b45d446a92114d1605d18f0fea05ce17;hb=ae2f017a268ad04e9676eaf47a8d5548005daa8e;hp=68261f6d9596fb0affb89e8743e48c1537d1c3e9;hpb=2391fe3b39ceef1cf0bdd335446df7572a95158f;p=cran2deb.git diff --git a/trunk/R/debcontrol.R b/trunk/R/debcontrol.R index 68261f6..da13e33 100644 --- a/trunk/R/debcontrol.R +++ b/trunk/R/debcontrol.R @@ -14,6 +14,7 @@ get_dependencies <- function(pkg,extra_deps,verbose=TRUE) { # add the command line dependencies depends$bin = c(extra_deps$deb,depends$bin) depends$build = c(extra_deps$deb,depends$build) + notice('getting system requirements') # add the system requirements if ('SystemRequirements' %in% colnames(pkg$description)) { sysreq <- sysreqs_as_debian(pkg$description[1,'SystemRequirements'],verbose=verbose) @@ -49,17 +50,22 @@ get_dependencies <- function(pkg,extra_deps,verbose=TRUE) { depends <- lapply(depends,unique) # append the Debian dependencies - depends$build=c(depends$build,'debhelper (>> 4.1.0)','cdbs','${R:Depends}') + depends$build=c(depends$build,'debhelper (>> 4.1.0)','cdbs') + + ## add R:Depends + depends$bin = c(depends$bin,'${R:Depends}'); + if (file.exists(file.path(patch_dir, pkg$name))) { depends$build <- c(depends$build,'dpatch') } if (pkg$archdep) { depends$bin=c(depends$bin,'${shlibs:Depends}') } - + notice('starting dependency closure') # the names of dependent source packages (to find the .changes file to # upload via dput). these can be found recursively. depends$r = r_dependency_closure(dependencies) + notice('finished dependency closure') # append command line dependencies depends$r = c(extra_deps$r, depends$r) return(depends)