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 ec625f596b58ca99959f3c582fbdbabc65901a1c..6ca79181725ae262c32840ca7549b8664c289864 100644 (file)
--- 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 ef12979352a4533377e8e2ccb0ff9dcfc24b4244..296ddfdb2485d6f4aa80d32eb5eb71bcec1ea554 100644 (file)
--- 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