Update as used for R 2.11.0

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

5 files changed, 6 insertions, 7 deletions

diff --git a/backport_others.sh b/backport_others.sh
index 534c977..bd33e75 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.10.0
+Rversion=2.11.0
 
 echo Distribution is $DIST
 echo Architecture is $ARCH
@@ -29,8 +29,8 @@ for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-clas
     version=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`~$DIST"cran".$Rversion
     dch -b -v $version --force-distribution -D $DIST-cran $text
 
-    ssed -i -R '/^Build-Depends/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.10.0-1~etchcran.0)/' debian/control
-    ssed -i -R '/^Build-Depends-Indep/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.10.0-1~etchcran.0)/' debian/control
+    ssed -i -R '/^Build-Depends/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.11.0-1~etchcran.0)/' debian/control
+    ssed -i -R '/^Build-Depends-Indep/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.11.0-1~etchcran.0)/' debian/control
 
     dch -a "debian/control: adapt build dependencies on r-base-dev to current backport"
 
diff --git a/backport_r-base.sh b/backport_r-base.sh
index 03b5f00..f5403f2 100644
--- a/backport_r-base.sh
+++ b/backport_r-base.sh
@@ -56,7 +56,6 @@ dch -v "${cranversion}" --force-distribution -D $DIST-cran -b "Backport from Deb
 	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 in this release's version of 'debhelper'" 
-    cp ../r-doc-scripts/r-doc-{info,html}.{postinst,prerm} debian
 
     # 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
diff --git a/build_others.sh b/build_others.sh
index d56cdb8..5791ad3 100644
--- a/build_others.sh
+++ b/build_others.sh
@@ -18,6 +18,6 @@ for i in cluster foreign lattice mgcv nlme r-cran-class r-cran-spatial r-cran-nn
     apt-get source -t $DIST-cran $i
     cd $i-*
 
-    pdebuild --debbuildopts '-b' --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 --buildresult /home/ranke/svn/website/www/ranke/r-cran/$DIST-cran/ -- --binary-arch --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/build_r-base.sh b/build_r-base.sh
index c84af4c..2d09f22 100644
--- a/build_r-base.sh
+++ b/build_r-base.sh
@@ -21,7 +21,7 @@ cd r-base-*
 
 pbuilder update
 
-pdebuild --debbuildopts '-b' --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 --buildresult /home/ranke/svn/website/www/ranke/r-cran/$DIST-cran/ -- --binary-arch --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/clean.sh b/clean.sh
index 6cb2035..9a7bf60 100644
--- a/clean.sh
+++ b/clean.sh
@@ -1,5 +1,5 @@
 # Author: Johannes Ranke <jranke@uni-bremen.de>
 
-for i in r-base boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-mass r-cran-nnet r-cran-spatial rmatrix rodbc rpart survival vr littler; do
+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 vr littler; do
     rm -rf $i*
 done