diff options
| author | ranke <ranke@f247ebf9-aa24-0410-a698-f940e971ad2b> | 2015-03-09 19:42:32 +0000 |
|---|---|---|
| committer | ranke <ranke@f247ebf9-aa24-0410-a698-f940e971ad2b> | 2015-03-09 19:42:32 +0000 |
| commit | 88ed32e1fb0f4e71b09f352bba727e1342ebba56 (patch) | |
| tree | 2018f0138a33388dacf146e139033cf3c88ef301 | |
| parent | 09956eb516c7b075382208cff60d8c157bb00e88 (diff) | |
Changes for R 3.1.3
git-svn-id: svn+ssh://stiller/home/schatz/reps/r-backports@99 f247ebf9-aa24-0410-a698-f940e971ad2b
| -rw-r--r-- | backport_others.sh | 5 | ||||
| -rw-r--r-- | backport_r-base.sh | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/backport_others.sh b/backport_others.sh index 6c970af..a94b488 100644 --- a/backport_others.sh +++ b/backport_others.sh @@ -11,7 +11,7 @@ # - Set the R version # R version against which the software is compiled -Rversion=3.1.2 +Rversion=3.1.3 reposversion="cran3" echo Distribution is $DIST @@ -31,8 +31,7 @@ pbuilder update # single package: #for i in rpy2; do # squeeze/wheezy packages: -for i in mgcv boot cluster codetools foreign kernsmooth r-cran-class r-cran-coda r-cran-spatial r-cran-nnet rodbc rpart littler rpy rpy2 rkward r-cran-rjags; 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 r-cran-rjags; 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 r-cran-rjags; do apt-get source $i cd $i-* version=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`~$DIST"cran."$Rversion diff --git a/backport_r-base.sh b/backport_r-base.sh index 8c5b7e6..a71b351 100644 --- a/backport_r-base.sh +++ b/backport_r-base.sh @@ -56,7 +56,7 @@ then sed -i '/^Build-Depends/s/libtiff5-dev/libtiff-dev/' debian/control dch -a "debian/control: Change Build-Depends: from libtiff5-dev to libtiff-dev" - # 2. TODO: Revert build dependencies for tcl 8.6 and tk 8.6 + # 2. Revert build dependencies for tcl 8.6 and tk 8.6 # Versions 8.4 are default in squeeze, 8.5 in wheezy sed -i '/^Build-Depends/s/tcl8.6-dev/tcl8.4-dev/' debian/control sed -i '/^Build-Depends/s/tk8.6-dev/tk8.4-dev/' debian/control @@ -64,6 +64,17 @@ then dch -a "debian/control: Change Build-Depends: from tk8.6-dev to tk8.4-dev" fi +# Reverts for wheezy: +if [ $DIST = "wheezy" ] +then + # 1. Revert build dependencies for tcl 8.6 and tk 8.6 + # Versions 8.4 are default in squeeze, 8.5 in wheezy + sed -i '/^Build-Depends/s/tcl8.6-dev/tcl8.5-dev/' debian/control + sed -i '/^Build-Depends/s/tk8.6-dev/tk8.5-dev/' debian/control + dch -a "debian/control: Change Build-Depends: from tcl8.6-dev to tcl8.5-dev" + dch -a "debian/control: Change Build-Depends: from tk8.6-dev to tk8.5-dev" +fi + pbuilder update --debootstrapopts "--keyring=/usr/share/keyrings/debian-archive-keyring.gpg" pdebuild --debbuildopts '-sa' --buildresult /home/ranke/svn/website/www/ranke/r-cran/$DIST-$reposversion/ -- --distribution $DIST --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache --buildplace /var/cache/pbuilder/$DIST-$ARCH/build if [ $? -ne 0 ]; then |