Update of the build scripts used for the R 3.0.0 backport, changing the build location for the backports

git-svn-id: svn+ssh://stiller/home/schatz/reps/r-backports@83 f247ebf9-aa24-0410-a698-f940e971ad2b

9 files changed, 21 insertions, 52 deletions

diff --git a/README b/README
index 87ec386..46af6d3 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 This directory contains my scripts to build backports of R software from Debian
 sid to older Debian distributions.
 
-Currently (2013-03-03) I am using the following setup:
+Currently (2013-04-04) I am using the following setup:
 
 ~/.pbuilderrc contains:
 
@@ -22,7 +22,7 @@ creation under /var/cache/pbuilder, among others:
 
 /var/cache/pbuilder/squeeze-i386-base.tgz
 
-These have a standard Debian mirror and the security sources setup in their
-/etc/apt/sources.list, as well as my local http package source where the r-base
-package build results are available. I have also imported the apt key of my
-repository inside the pbuilder chroots.
+These have a standard Debian mirror, the security sources and the Debian
+backports repository setup in their /etc/apt/sources.list, as well as my local
+http package source where the r-base package build results are available. I
+have also imported the apt key of my repository inside the pbuilder chroots.
diff --git a/backport_jags.sh b/backport_jags.sh
index f4ab3f1..71e30f9 100644
--- a/backport_jags.sh
+++ b/backport_jags.sh
@@ -39,7 +39,7 @@ dch -v "${cranversion}" --force-distribution -D $DIST-cran -b "Backport from Deb
 # Reverts for squeeze 
 
 pbuilder update
-pdebuild --debbuildopts '-sa' --buildresult /home/ranke/svn/website/www/ranke/r-cran/$DIST-cran/ -- --distribution $DIST --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache --buildplace /var/cache/pbuilder/$DIST-$ARCH/build
+pdebuild --debbuildopts '-sa' --buildresult /home/ranke/svn/website/www/ranke/r-cran/$DIST-cran3/ -- --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
     exit 
 fi
diff --git a/backport_others.sh b/backport_others.sh
index b0e9b8e..9b66c63 100644
--- a/backport_others.sh
+++ b/backport_others.sh
@@ -12,7 +12,7 @@
 #                - Set the R version
 
 # R version against which the software is compiled
-Rversion=2.15.3
+Rversion=3.0.0
 
 echo Distribution is $DIST
 echo Architecture is $ARCH
@@ -27,17 +27,17 @@ pbuilder update
 # lenny packages:
 #for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-spatial r-cran-nnet r-cran-mass rmatrix rodbc rpart survival littler; do
 # squeeze packages:
-for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-spatial r-cran-nnet r-cran-mass rmatrix rodbc rpart survival littler rpy rkward r-cran-rjags; do
+for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-spatial r-cran-nnet r-cran-mass rmatrix rodbc rpart survival littler rpy rkward; do
     apt-get source $i
     cd $i-*
     version=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`~$DIST"cran".$Rversion
-    dch -b -v $version --force-distribution -D $DIST-cran $text
+    dch -b -v $version --force-distribution -D $DIST-cran3 $text
 
-    ssed -i -R '/^Build-Depends/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.15.3-1~squeezecran.0)/' debian/control
-    ssed -i -R '/^Build-Depends-Indep/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.15.3-1~squeezecran.0)/' debian/control
+    ssed -i -R '/^Build-Depends/s/r-base-dev \(>= \..*?\)/r-base-dev (>= 3.0.0-1~squeezecran.0)/' debian/control
+    ssed -i -R '/^Build-Depends-Indep/s/r-base-dev \(>= \..*?\)/r-base-dev (>= 3.0.0-1~squeezecran.0)/' debian/control
 
     dch -a "debian/control: adapt build dependencies on r-base-dev to current backport"
 
-    pdebuild --debbuildopts '-sa' --buildresult /home/ranke/svn/website/www/ranke/r-cran/$DIST-cran/ -- --distribution $DIST --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache --buildplace /var/cache/pbuilder/$DIST-$ARCH/build
+    pdebuild --debbuildopts '-sa' --buildresult /home/ranke/svn/website/www/ranke/r-cran/$DIST-cran3/ -- --distribution $DIST --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache --buildplace /var/cache/pbuilder/$DIST-$ARCH/build
     cd ..
 done
diff --git a/backport_r-base.sh b/backport_r-base.sh
index 74ed659..d2a08f1 100644
--- a/backport_r-base.sh
+++ b/backport_r-base.sh
@@ -45,7 +45,7 @@ echo CRAN version is $cranversion
 # Add new version to changelog
 dch -v "${cranversion}" --force-distribution -D $DIST-cran -b "Backport from Debian unstable to Debian $DIST"
 
-# Reverts for squeeze and lenny:
+# Reverts for squeeze:
     # 1. Starting with Debian packages for R 2.15.3 there is a build
     # dependency on 'libtiff5-dev' which is not in squeeze. Changing to
     # libtiff-dev, which is libtiff4-dev on squeeze.
@@ -53,36 +53,8 @@ dch -v "${cranversion}" --force-distribution -D $DIST-cran -b "Backport from Deb
     sed -i '/^Build-Depends/s/libtiff5-dev/libtiff-dev/' debian/control
     dch -a "debian/control: Change Build-Depends: from libtiff5-dev to libtiff-dev"
 
-# Reverts for lenny only:
-if [ $DIST = "lenny" ]
-then
-
-    # 1. Starting with Debian packages for R 2.9.2 there is a build dependency
-    # on debhelper >= 7.2.3, which is not in lenny nor etch This also means we
-    # have to reinclude debian/r-doc-{info,html}.{postinst,prerm}, thanks Dirk
-    # for pointing this out.
-
-	sed -i '/^Build-Depends/s/debhelper (>= 7.2.3)/debhelper/' debian/control
-	dch -a "debian/control: revert Build-Depends: to 'debhelper' since $DIST has a version < 7.2.3"
-	sed -i 's/dh_prep/dh_clean/g' debian/rules
-	dch -a "debian/rules: revert dh_prep calls to dh_clean calls since the latter is not present lennys version of 'debhelper'" 
-
-    # 2. Starting with Debian packages for R 2.9.2-2 there is an install
-    # dependency on 'dpkg (>= 1.15.4) | install-info'. Neither package is in
-    # Debian releases etch nor lenny. This also requires to reinclude
-    # debian/r-doc-{info,html}.{postinst,prerm}, just like for the fix above.
-
-    sed -i '/^Depends/s/dpkg (>= 1.15.4) | install-info/dpkg | install-info/' debian/control
-    dch -a "debian/control: revert Depends: to 'dpkg | install-info' for r-doc-info since lenny has a version of dpkg < 1.15.4 and no separate package install-info"
-
-    # 3. liblzma is not available in Debian distributions before squeeze
-
-    sed -i '/^Build-Depends/s/, liblzma-dev//' debian/control
-    dch -a "debian/control: Remove dependency to liblzma-dev as it is not available in lenny. As a consequence, the version provided in the R sources is used"
-fi
-
 pbuilder update
-pdebuild --debbuildopts '-sa' --buildresult /home/ranke/svn/website/www/ranke/r-cran/$DIST-cran/ -- --distribution $DIST --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache --buildplace /var/cache/pbuilder/$DIST-$ARCH/build
+pdebuild --debbuildopts '-sa' --buildresult /home/ranke/svn/website/www/ranke/r-cran/$DIST-cran3/ -- --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
     exit 
 fi
diff --git a/build_jags.sh b/build_jags.sh
index 4727dbf..b0c7a19 100644
--- a/build_jags.sh
+++ b/build_jags.sh
@@ -3,8 +3,6 @@
 # Script to facilitate building jags binaries for CRAN in a chroot
 # Matching CRAN sources must be in /etc/apt/sources.list of the chroot
 
-# Author: Johannes Ranke <jranke@uni-bremen.de>
-
 apt-get update
 apt-get build-dep jags
 apt-get source jags
diff --git a/build_others.sh b/build_others.sh
index 2d4e4f1..9d207c7 100644
--- a/build_others.sh
+++ b/build_others.sh
@@ -1,11 +1,13 @@
 # Author: Johannes Ranke <jranke@uni-bremen.de>
 
 apt-get update
+apt-get upgrade
 
-# lenny
-#for i in cluster foreign lattice mgcv nlme r-cran-class r-cran-spatial r-cran-nnet r-cran-mass kernsmooth rmatrix rodbc rpart survival littler; do
 # squeeze
-for i in cluster foreign lattice mgcv nlme r-cran-class r-cran-spatial r-cran-nnet r-cran-mass kernsmooth rmatrix rodbc rpart survival littler rpy rkward r-cran-rjags; do
+# The first three packages are needed for others
+for i in r-cran-rjags; do
+#for i in cluster foreign r-cran-class r-cran-coda r-cran-spatial r-cran-nnet r-cran-mass kernsmooth mgcv rodbc rpart survival littler rpy rkward r-cran-rjags; do
+#for i in lattice rmatrix nlme cluster foreign r-cran-class r-cran-coda r-cran-spatial r-cran-nnet r-cran-mass kernsmooth mgcv rodbc rpart survival littler rpy rkward r-cran-rjags; do
     apt-get --no-install-recommends build-dep $i
     apt-get source $i
     cd $i-*
diff --git a/build_r-base.sh b/build_r-base.sh
index ca48af3..d659e3a 100644
--- a/build_r-base.sh
+++ b/build_r-base.sh
@@ -3,8 +3,6 @@
 # Script to facilitate building r-base binaries for CRAN in a chroot
 # Matching CRAN sources must be in /etc/apt/sources.list of the chroot
 
-# Author: Johannes Ranke <jranke@uni-bremen.de>
-
 apt-get update
 apt-get build-dep r-base
 apt-get source r-base
diff --git a/clean.sh b/clean.sh
index b10b21b..e70cb08 100644
--- a/clean.sh
+++ b/clean.sh
@@ -1,6 +1,6 @@
 # Author: Johannes Ranke <jranke@uni-bremen.de>
 
-for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-mass r-cran-nnet r-cran-spatial rmatrix rodbc rpart survival littler rpy rkward jags r-cran-rjags; do
+for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-coda r-cran-mass r-cran-nnet r-cran-spatial rmatrix rodbc rpart survival littler rpy rkward jags r-cran-rjags; do
     rm -rf $i-* # build directories leftover from backporting
     rm $i*.dsc # source package descriptions from Debian unstable
     rm $i*.diff.gz # source package diffs from Debian unstable
diff --git a/move_squeeze64.sh b/move_squeeze64.sh
index b3a78b1..eef1808 100644
--- a/move_squeeze64.sh
+++ b/move_squeeze64.sh
@@ -3,5 +3,4 @@
 # Move binary packages built in a chroot to the local repository
 
 #mv /var/chroot/squeeze-amd64/home/ranke/svn/r-backports/*squeezecran*_amd64.deb ~/svn/website/www/ranke/r-cran/squeeze-cran
-mv *squeezecran*_amd64.deb ~/svn/website/www/ranke/r-cran/squeeze-cran
-
+mv *squeezecran*_amd64.deb ~/svn/website/www/ranke/r-cran/squeeze-cran3