summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2017-07-21 13:00:23 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2017-07-21 13:00:23 +0200
commitd2670e5e4f2edbb46bb5f0e185cf3cb3ee7e0648 (patch)
treedfa3859aa569e1fa451f3503fb4547534fbaca21
parenta14a861210c8a1374d0809f674ccf767088a41ac (diff)
Reinclude rpy2, trailing whitespace
-rwxr-xr-xbackport_others10
-rwxr-xr-xbuild_others2
2 files changed, 6 insertions, 6 deletions
diff --git a/backport_others b/backport_others
index c2fa8c1..0cae945 100755
--- a/backport_others
+++ b/backport_others
@@ -39,7 +39,7 @@ done
if [ $# -lt 1 ]; then usage; exit 1; fi
DIST=$1
-# Update apt and pbuild chroot
+# Update apt and pbuild chroot
if [ "$skip" = false ]
then
sudo apt-get update
@@ -47,7 +47,7 @@ then
sudo -E pbuilder update \
--distribution $DIST \
--basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz \
- --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache
+ --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache
fi
# Validate distribution argument
@@ -57,9 +57,9 @@ export DIST
# When doing a new repository, lattice, r-cran-mass and survival have to be
# built first, then nlme and rmatrix, then the rest
-# Packages to backport (without rpy2):
-for i in lattice nlme rmatrix mgcv boot cluster codetools foreign kernsmooth r-cran-class r-cran-coda r-cran-spatial r-cran-nnet r-cran-mass rodbc rpart survival littler rpy rkward r-cran-rjags; do
-
+# Packages to backport:
+for i in lattice nlme rmatrix mgcv boot cluster codetools foreign kernsmooth r-cran-class r-cran-coda r-cran-spatial r-cran-nnet r-cran-mass rodbc rpart survival littler rpy rpy2 rkward r-cran-rjags; do
+
./backport -s $i $DIST
done
diff --git a/build_others b/build_others
index 7865382..ea48dfc 100755
--- a/build_others
+++ b/build_others
@@ -41,6 +41,6 @@ fi
# wheezy/jessie/stretch
#for i in lattice r-cran-mass survival; do
#for i in nlme rmatrix; do
-for i in lattice rmatrix nlme cluster foreign r-cran-class r-cran-spatial r-cran-nnet r-cran-mass kernsmooth mgcv rodbc rpart survival littler rpy rkward r-cran-rjags; do
+for i in lattice rmatrix nlme cluster foreign r-cran-class r-cran-spatial r-cran-nnet r-cran-mass kernsmooth mgcv rodbc rpart survival littler rpy rpy2 rkward r-cran-rjags; do
./build -s $i
done

Contact - Imprint