Support stretch (testing) instead of wheezy (oldstable)

3 files changed, 20 insertions, 10 deletions

diff --git a/backport b/backport
index c363875..ed47e2f 100755
--- a/backport
+++ b/backport
@@ -24,7 +24,7 @@ rcrandir=/home/jranke/svn/website/www/ranke/r-cran
 
 usage()
 {
-echo "Usage: ./backport [options] sourcepackage wheezy|jessie"
+echo "Usage: ./backport [options] sourcepackage stretch|jessie"
 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"
@@ -60,7 +60,7 @@ pkg=$1
 DIST=$2
 
 # Validate distribution argument
-if [ $DIST != "wheezy" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
+if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
 export DIST
 
 # Set required r-base-dev version for packages build-depending on R
@@ -129,7 +129,10 @@ else
 
   if [ "$skip" = false ]
   then
-    sudo -E pbuilder update
+    sudo -E pbuilder update \
+      --distribution $DIST \
+      --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz \
+      --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache 
   fi
   sudo -E pdebuild --debbuildopts '-sa' \
     --buildresult $rcrandir/$DIST-cran3/ \
diff --git a/backport_others b/backport_others
index faf604c..c2fa8c1 100755
--- a/backport_others
+++ b/backport_others
@@ -3,11 +3,15 @@
 # Author: Johannes Ranke <jranke@uni-bremen.de>
 
 # Script to automate backporting for CRAN
-# Make sure the R version in ./backport is correctly set and the pbuilder chroot is updated
+# Make sure the R version in ./backport is correctly set
+
+# Creates a source package and binary packages for the following architecture
+ARCH=i386
+export ARCH
 
 usage()
 {
-echo "Usage: ./backport_others [options] wheezy|jessie"
+echo "Usage: ./backport_others [options] stretch|jessie"
 echo "Options:"
 echo " -s     Skip apt-get update/upgrade and pbuilder update"
 }
@@ -40,17 +44,20 @@ if [ "$skip" = false ]
 then
   sudo apt-get update
   sudo apt-get upgrade
-  sudo -E pbuilder update
+  sudo -E pbuilder update \
+      --distribution $DIST \
+      --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz \
+      --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache 
 fi
 
 # Validate distribution argument
-if [ $DIST != "wheezy" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
+if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
 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 to wheezy/jessie (without rpy2):
+# 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
   
   ./backport -s $i $DIST
diff --git a/clean b/clean
index cc55406..7f6535c 100755
--- a/clean
+++ b/clean
@@ -4,14 +4,14 @@
 
 usage()
 {
-echo "Usage: ./clean [wheezy|jessie]"
+echo "Usage: ./clean [stretch|jessie]"
 }
 
 if [ $# -gt 1 ]; then usage; exit 1; fi
 if [ $# -eq 1 ]
 then
   DIST=$1
-  if [ $DIST != "wheezy" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
+  if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
   cd $DIST
 fi