From 2d1c919cd782a90fbbc9c79a60e478b1c2116730 Mon Sep 17 00:00:00 2001 From: blundellc Date: Sat, 13 Sep 2008 13:17:22 +0000 Subject: [PATCH] cran2deb: prune unrequired bits from pbuilder. correct type error in R dependency calculation. git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@51 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- pkg/trunk/R/rdep.R | 2 +- pkg/trunk/inst/etc/pbuilderrc.in | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/trunk/R/rdep.R b/pkg/trunk/R/rdep.R index 0af9451..1cc3054 100644 --- 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 ec9a9c4..a84b61b 100644 --- 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/' -- 2.39.5