From: blundellc <blundellc@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Sat, 13 Sep 2008 13:19:51 +0000 (+0000)
Subject: cran2deb: fixes from first round of mass builds. no major problems so far...
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7ac6af22ebe1c83bde7aa4706af30e1138e4c8ec;p=cran2deb.git

cran2deb: fixes from first round of mass builds. no major problems so far...

most significant change: add a bundle and all it contains to the list of
possible reverse arc dependencies.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@70 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
---

diff --git a/pkg/trunk/R/rdep.R b/pkg/trunk/R/rdep.R
index ec625f5..6ca7918 100644
--- a/pkg/trunk/R/rdep.R
+++ b/pkg/trunk/R/rdep.R
@@ -22,7 +22,11 @@ r.requiring <- function(names) {
             if (is.na(bundle)) {
                 stop(paste('package',name,'is not available'))
             }
-            names <- c(names,r.bundle.contains(bundle))
+            name = bundle
+            names <- c(names,bundle)
+        }
+        if (!is.na(available[name,'Contains'])) {
+            names <- c(names,r.bundle.contains(name))
         }
     }
     # approximately prune first into a smaller availability
diff --git a/pkg/trunk/data/populate_sysreq b/pkg/trunk/data/populate_sysreq
index ef12979..296ddfd 100644
--- a/pkg/trunk/data/populate_sysreq
+++ b/pkg/trunk/data/populate_sysreq
@@ -1,6 +1,6 @@
 add build-essential gcc
 add build-essential gnu make
-add libquantlib0-dev quantlib
+add libquantlib0-dev quantlib*
 add pari-gp pari/gp
 add libcairo2-dev cairo
 add libgd2-noxpm-dev libgd