From b4653163dfd5876b6a5adfb5f8878fd3525d547b Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Sat, 13 May 2017 00:58:47 +0200
Subject: Changes for the new backport of R 3.4.0

Now in two new repositories, jessie-cran34 and stretch-cran34
---
 backport     | 3 +--
 build        | 2 +-
 build_others | 2 +-
 move_debs    | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/backport b/backport
index b68cd8f..7fdffe5 100755
--- a/backport
+++ b/backport
@@ -7,7 +7,6 @@ export ARCH
 
 # R version against which the software is compiled
 Rversion=3.4.0
-reposversion="cran3"
 iteration=0
 
 # Where the buildresults should be stored and where to look for current backports
@@ -99,7 +98,7 @@ cranversion=$upstreamversion"~"$DIST"cran.$iteration"
 # would make an update of the archive index inside the loop in backport_others 
 # necessary
 
-new_dsc=$rcrandir/$DIST-cran3/${pkg}_${cranversion}.dsc
+new_dsc=$rcrandir/$DIST-cran34/${pkg}_${cranversion}.dsc
 
 if [ -e $new_dsc ]; then
 
diff --git a/build b/build
index 053a167..03a7231 100755
--- a/build
+++ b/build
@@ -7,7 +7,7 @@ usage()
 {
 echo "Usage: ./build [options] sourcepackage"
 echo "Options:"
-echo " -s, --skip    Skip apt-get update/upgrade and pbuilder update"
+echo " -s, --skip    Skip apt-get update/upgrade"
 }
 
 DIST=`lsb_release -cs`
diff --git a/build_others b/build_others
index 45311bb..7865382 100755
--- a/build_others
+++ b/build_others
@@ -38,7 +38,7 @@ fi
 # When doing a new repository, lattice, r-cran-mass and survival have to be
 # built first, then nlme and rmatrix, then the rest
 
-# wheezy/jessie
+# 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
diff --git a/move_debs b/move_debs
index 06d9c12..243b916 100755
--- a/move_debs
+++ b/move_debs
@@ -15,4 +15,4 @@ DIST=$1
 if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
 
 chown jranke $DIST/*${DIST}cran*_amd64.deb
-mv -v $DIST/*${DIST}cran*_amd64.deb /home/jranke/svn/website/www/ranke/r-cran/$DIST-cran3
+mv -v $DIST/*${DIST}cran*_amd64.deb /home/jranke/svn/website/www/ranke/r-cran/$DIST-cran34
-- 
cgit v1.2.1