cran2deb: prune unrequired bits from pbuilder. correct type error in R dependency...

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

diff --git a/pkg/trunk/R/rdep.R b/pkg/trunk/R/rdep.R
index 0af94516de698478dcb8149314a6c15425d7c160..1cc30546bc6a9d8ab682d72ebb3b24e349a97593 100644 (file)
--- a/pkg/trunk/R/rdep.R
+++ b/pkg/trunk/R/rdep.R
@@ -124,7 +124,7 @@ r.dependency.closure <- function(fringe, forward_arcs=T) {
     # packages
     closure <- list()
     if (is.data.frame(fringe)) {
-        fringe <- levels(fringe$name)
+        fringe <- as.list(fringe$name)
     }
     fun = function(x) levels(r.dependencies.of(name=x)$name)
     if (!forward_arcs) {

diff --git a/pkg/trunk/inst/etc/pbuilderrc.in b/pkg/trunk/inst/etc/pbuilderrc.in
index ec9a9c483a075b8f5d257f720a2d1697c50eba38..a84b61b67b258e05cadb1913b5647fa056e1e56b 100644 (file)
--- a/pkg/trunk/inst/etc/pbuilderrc.in
+++ b/pkg/trunk/inst/etc/pbuilderrc.in
@@ -1,6 +1,9 @@
 HOOKDIR=@ROOT@/etc/hook
 BUILDRESULT=@ROOT@/var/results
-EXTRAPACKAGES='debhelper r-base-dev cdbs r-base-core lintian xauth xfonts-base xvfb'
+EXTRAPACKAGES='debhelper r-base-dev cdbs r-base-core lintian xvfb xauth xfonts-base'
+REMOVEPACKAGES='lilo libldap-2.4-2 libopencdk10 libsasl2-2'
+# don't actually need aptitude, but pbuilder insists...
+#REMOVEPACKAGES+='aptitude libcwidget3 libept0 libncursesw5 libsigc++-2.0-0c2a libxapian15'
 DISTRIBUTION=lenny
 OTHERMIRROR='deb http://localhost/users/cb/cran2deb/ unstable/$(ARCH)/ | deb http://localhost/users/cb/cran2deb/ unstable/all/'
 MIRRORSITE='http://ftp.debian.org/debian/'