]> git.donarmstrong.com Git - cran2deb.git/commitdiff
only apply R depends to binary packages
authorDon Armstrong <don@donarmstrong.com>
Tue, 4 Jun 2013 00:06:30 +0000 (17:06 -0700)
committerDon Armstrong <don@donarmstrong.com>
Tue, 4 Jun 2013 00:06:30 +0000 (17:06 -0700)
trunk/R/debcontrol.R
trunk/debian/changelog

index 76c7e5a2387bae0e3b9931c1e1d906a8bb5e10ec..ca6a635de23e456a1a8fd0c52dc9e3e2f829da60 100644 (file)
@@ -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')
     }
index 375b9d6bbf1f6df123c1149b01d0803fc9cc5ff2..924c156dd6759522c62b77fb1ac2615fa12841ff 100644 (file)
@@ -1,3 +1,9 @@
+r-cran-cran2deb (0.0.1+build.only-3) unstable; urgency=low
+
+  * Fix build dependencies
+
+ -- Don Armstrong <don@debian.org>  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