From e8ee0b1f62add13b8ac5db51633c4172ca8071ab Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Mon, 3 Jun 2013 17:06:30 -0700 Subject: [PATCH] only apply R depends to binary packages --- trunk/R/debcontrol.R | 6 ++++-- trunk/debian/changelog | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/trunk/R/debcontrol.R b/trunk/R/debcontrol.R index 76c7e5a..ca6a635 100644 --- a/trunk/R/debcontrol.R +++ b/trunk/R/debcontrol.R @@ -14,8 +14,6 @@ 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) - ## add R:Depends - depends$bin = c(depends$bin,'${R:Depends}'); # add the system requirements if ('SystemRequirements' %in% colnames(pkg$description)) { sysreq <- sysreqs_as_debian(pkg$description[1,'SystemRequirements'],verbose=verbose) @@ -52,6 +50,10 @@ get_dependencies <- function(pkg,extra_deps,verbose=TRUE) { # append the Debian dependencies 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') } diff --git a/trunk/debian/changelog b/trunk/debian/changelog index 375b9d6..924c156 100644 --- a/trunk/debian/changelog +++ b/trunk/debian/changelog @@ -1,3 +1,9 @@ +r-cran-cran2deb (0.0.1+build.only-3) unstable; urgency=low + + * Fix build dependencies + + -- Don Armstrong Mon, 03 Jun 2013 13:46:59 -0700 + r-cran-cran2deb (0.0.1+build.only-1) unstable; urgency=low * New version for builds only -- 2.39.2