From 7b93b13150331910a2ff0ea01472b12d41062efa Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 24 Apr 2018 10:56:23 +0200 Subject: Changes for backporting R 3.5.0 --- README | 2 +- backport | 8 ++++---- backport_others | 12 +++++++----- build | 2 +- build_others | 4 ++-- move_debs | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/README b/README index 3ce257f..9f4a759 100644 --- a/README +++ b/README @@ -15,7 +15,7 @@ Currently I am using the following setup: BUILDRESULT="/var/cache/pbuilder/$NAME/result/" APTCACHE="/var/cache/pbuilder/$NAME/aptcache/" MIRRORSITE="http://ftp.de.debian.org/debian/" - OTHERMIRROR="deb http://security.debian.org $DIST/updates main|deb http://localhost/r-cran $DIST-cran34/" + OTHERMIRROR="deb http://security.debian.org $DIST/updates main|deb http://ftp.de.debian.org/debian $DIST-backports main|deb http://localhost/r-cran $DIST-cran35/" COMPONENTS="main" This means I have the appropriate aptcache and buildresult directories set up diff --git a/backport b/backport index 04c2f38..7420ef8 100755 --- a/backport +++ b/backport @@ -7,7 +7,7 @@ export ARCH # R version against which the software is compiled iteration=0 -Rversion=3.4.4 +Rversion=3.5.0 # 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 -logfile=$rcrandir/$DIST-cran34/${pkg}_${cranversion}_${ARCH}.build +new_dsc=$rcrandir/$DIST-cran35/${pkg}_${cranversion}.dsc +logfile=$rcrandir/$DIST-cran35/${pkg}_${cranversion}_${ARCH}.build if [ -e $new_dsc ]; then @@ -136,7 +136,7 @@ else --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache fi sudo -E pdebuild --debbuildopts '-sa' \ - --buildresult $rcrandir/$DIST-cran34/ \ + --buildresult $rcrandir/$DIST-cran35/ \ --logfile $logfile \ -- --override-config \ --distribution $DIST --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz \ diff --git a/backport_others b/backport_others index b8c456d..387901c 100755 --- a/backport_others +++ b/backport_others @@ -54,15 +54,17 @@ fi if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi export DIST -# When doing a new repository, do lattice, r-cran-mass, rmatrix, +# When doing a new repository, do lattice, r-cran-mass +# then rmatrix, # then survival and nlme, then the rest # Packages to backport: +#for i in dh-r; do # dh is not available in jessie, therefore start with this #for i in lattice r-cran-mass; do -#for i in rmatrix nlme; do -#for i in survival; do -#for i in rpart mgcv boot cluster codetools foreign kernsmooth r-cran-class r-cran-coda r-cran-spatial r-cran-nnet rodbc littler rpy rpy2 rkward; do -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; do +#for i in rmatrix; do +#for i in survival nlme; do +for i in rpart mgcv boot cluster codetools foreign kernsmooth r-cran-class r-cran-coda r-cran-spatial r-cran-nnet rodbc littler rpy rpy2 rkward; do +#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; do ./backport -s $i $DIST diff --git a/build b/build index 54c3d4c..800c86a 100755 --- a/build +++ b/build @@ -18,7 +18,7 @@ command -v lsb_release >/dev/null 2>&1 || { DIST=`lsb_release -cs` # URL of the local CRAN repo for checking for existing builds -localcran="http://tux/r-cran/$DIST-cran34/" +localcran="http://ryz/r-cran/$DIST-cran35/" skip=false while test -n "${1}"; do diff --git a/build_others b/build_others index 14777eb..86a5657 100755 --- a/build_others +++ b/build_others @@ -39,7 +39,7 @@ fi #for i in lattice r-cran-mass; do #for i in rmatrix nlme; do #for i in survival; do -#for i in cluster foreign r-cran-class r-cran-spatial r-cran-nnet kernsmooth mgcv rodbc rpart littler rpy rpy2 rkward; 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; do +for i in cluster foreign r-cran-class r-cran-spatial r-cran-nnet kernsmooth mgcv rodbc rpart littler rpy rpy2 rkward; 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; do ./build -s $i done diff --git a/move_debs b/move_debs index a1d468c..dcc6ede 100755 --- a/move_debs +++ b/move_debs @@ -15,4 +15,4 @@ DIST=$1 if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi sudo chown jranke $DIST/*${DIST}cran*_amd64.{deb,build} -mv -v $DIST/*${DIST}cran*_amd64.{deb,build} /home/jranke/svn/website/www/ranke/r-cran/$DIST-cran34 +mv -v $DIST/*${DIST}cran*_amd64.{deb,build} /home/jranke/svn/website/www/ranke/r-cran/$DIST-cran35 -- cgit v1.2.1