diff options
Diffstat (limited to 'backport')
| -rwxr-xr-x | backport | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -7,7 +7,7 @@ export ARCH # R version against which the software is compiled iteration=0 -Rversion=3.4.3 +Rversion=3.4.4 # Set required r-base-dev version for packages build-depending on R rbasedev="r-base-dev (>= $Rversion)" @@ -17,7 +17,7 @@ rcrandir=/home/jranke/svn/website/www/ranke/r-cran # Author: Johannes Ranke <jranke@uni-bremen.de> -# Preconditions: +# Preconditions: # - up to date R version specified above, for packages depending on R # - sudo and pbuilder configuration (see README) # - sid sources in /etc/apt/sources/list @@ -26,7 +26,7 @@ rcrandir=/home/jranke/svn/website/www/ranke/r-cran usage() { -echo "Usage: ./backport [options] sourcepackage stretch|jessie|wheezy" +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" @@ -62,7 +62,7 @@ pkg=$1 DIST=$2 # Validate distribution argument -if [ $DIST != "stretch" ] && [ $DIST != "jessie" ] && [ $DIST != "wheezy" ]; then usage; exit 1; fi +if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi export DIST # Remove previously extracted sources @@ -94,8 +94,8 @@ upstreamversion=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "` cranversion=$upstreamversion"~"$DIST"cran.$iteration" # Only do a backport if not already available -# This avoids recompiling packages resulting in different sizes which -# would make an update of the archive index inside the loop in backport_others +# This avoids recompiling packages resulting in different sizes which +# would make an update of the archive index inside the loop in backport_others # necessary new_dsc=$rcrandir/$DIST-cran34/${pkg}_${cranversion}.dsc @@ -105,7 +105,7 @@ if [ -e $new_dsc ]; then echo backport.sh: $new_dsc already present -else +else echo backport.sh: Upstream version is $upstreamversion echo backport.sh: New CRAN version is $cranversion @@ -115,7 +115,7 @@ else # Adapt build dependency on r-base-dev if present if grep -q "^Build-Depends.*r-base-dev" debian/control - then + then ssed -i -R "/^Build-Depends/s/r-base-dev \(>= .*?\)/$rbasedev/" debian/control ssed -i -R "/^Build-Depends-Indep/s/r-base-dev \(>= .*?\)/$rbasedev/" debian/control @@ -133,7 +133,7 @@ else --override-config \ --distribution $DIST \ --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz \ - --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache + --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache fi sudo -E pdebuild --debbuildopts '-sa' \ --buildresult $rcrandir/$DIST-cran34/ \ @@ -143,7 +143,7 @@ else --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache \ --buildplace /var/cache/pbuilder/$DIST-$ARCH/build if [ $? -ne 0 ]; then - exit + exit fi fi |