summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2017-12-05 07:34:20 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2017-12-05 07:34:20 +0100
commit0a36a831a9c673804a2f71c0b028b4a1fc5b68e9 (patch)
tree0cd389ea384e386c54e678476dea1bed81d68d1f
parent7abefc4d0787b9bda965d7dac533e2bde783dcef (diff)
Changes for backport of R 3.4.3
-rwxr-xr-xbackport6
-rwxr-xr-xclean2
2 files changed, 4 insertions, 4 deletions
diff --git a/backport b/backport
index c9d8e3c..87c3fcc 100755
--- a/backport
+++ b/backport
@@ -7,7 +7,7 @@ export ARCH
# R version against which the software is compiled
iteration=0
-Rversion=3.4.2
+Rversion=3.4.3
# Set required r-base-dev version for packages build-depending on R
rbasedev="r-base-dev (>= $Rversion)"
@@ -98,8 +98,8 @@ cranversion=$upstreamversion"~"$DIST"cran.$iteration"
# would make an update of the archive index inside the loop in backport_others
# necessary
-#new_dsc=$rcrandir/$DIST-cran34/${pkg}_${cranversion}.dsc
-new_dsc=dummy_value # set temporarily to force rebuilds for the r-api-3.4 transition
+new_dsc=$rcrandir/$DIST-cran34/${pkg}_${cranversion}.dsc
+#new_dsc=dummy_value # set temporarily to force rebuilds for the r-api-3.4 transition
if [ -e $new_dsc ]; then
diff --git a/clean b/clean
index 7f6535c..741202b 100755
--- a/clean
+++ b/clean
@@ -15,7 +15,7 @@ then
cd $DIST
fi
-for i in r-base tcl tk boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-coda r-cran-mass r-cran-nnet r-cran-spatial rmatrix rodbc rpart survival littler rpy rpy2 rkward jags r-cran-rjags texinfo
+for i in r-base tcl tk boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-coda r-cran-mass r-cran-nnet r-cran-spatial rmatrix rodbc rpart survival littler rpy rpy2 rkward jags r-cran-rjags texinfo dh-r
do
if ls $i*.deb 1> /dev/null 2>&1; then "Please take care of .deb files hanging around"; exit 1; fi
rm -rf $i*

Contact - Imprint