Changes for backports of R 4.0.0 to bullseye and buster

1 files changed, 9 insertions, 9 deletions

diff --git a/backport b/backport
index d479968..acfde10 100755
--- a/backport
+++ b/backport
@@ -6,8 +6,8 @@ ARCH=i386
 export ARCH
 
 # R version against which the software is compiled
-iteration=0
-Rversion=3.6.1
+iteration=1
+Rversion=4.0.0
 
 # Set required r-base-dev version for packages build-depending on R
 rbasedev="r-base-dev (>= $Rversion)"
@@ -26,7 +26,7 @@ rcrandir=/home/jranke/git/uni/website/www/ranke/r-cran
 
 usage()
 {
-echo "Usage: ./backport [options] sourcepackage stretch|buster"
+echo "Usage: ./backport [options] sourcepackage stretch|buster|bullseye"
 echo "Options:"
 echo " -k, --keep    Keep copied source package and directory used for package building"
 echo " -s, --skip    Skip apt-get update/upgrade and pbuilder update"
@@ -62,7 +62,7 @@ pkg=$1
 DIST=$2
 
 # Validate distribution argument
-if [ $DIST != "stretch" ] && [ $DIST != "buster" ]; then usage; exit 1; fi
+if [ $DIST != "stretch" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
 export DIST
 
 # Remove previously extracted sources
@@ -71,13 +71,13 @@ then
     sudo rm -rf `ls -d $pkg-*`
 fi
 
-# Get current source (from unstable or buildd-unstable, depending on sources.list)
+# Get current source from sid. If we want buildd-unstable, we need to change to -t buildd-unstable below
 if [ "$skip" = false ]
 then
   sudo apt-get update
   sudo apt-get upgrade
 fi
-sudo apt-get source $pkg
+sudo apt-get source -t sid $pkg
 
 # Copy sources to $DIST directory to enable parallel builds
 mkdir -p $DIST
@@ -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-cran35/${pkg}_${cranversion}.dsc
-logfile=$rcrandir/$DIST-cran35/${pkg}_${cranversion}_${ARCH}.build
+new_dsc=$rcrandir/$DIST-cran40/${pkg}_${cranversion}.dsc
+logfile=$rcrandir/$DIST-cran40/${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-cran35/ \
+    --buildresult $rcrandir/$DIST-cran40/ \
     --logfile $logfile \
     -- --override-config \
        --distribution $DIST --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz \