Some more adaptations for the wheezy builds - not quite done yet.

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

3 files changed, 17 insertions, 22 deletions

diff --git a/README b/README
index bb26e4e..2e1b4b3 100644
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ Currently (2013-04-04) I am using the following setup:
   BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
   APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
   MIRRORSITE="http://ftp.de.debian.org/debian/"
-  OTHERMIRROR="deb http://security.debian.org $DIST/updates main|deb http://localhost/r-cran $DIST-cran/"
+  OTHERMIRROR="deb http://security.debian.org $DIST/updates main|deb http://localhost/r-cran $DIST-cran3/"
   COMPONENTS="main"
 
 This means I have the appropriate aptcache and buildresult directories set up
diff --git a/backport_others.sh b/backport_others.sh
index 9b66c63..dc74564 100644
--- a/backport_others.sh
+++ b/backport_others.sh
@@ -1,7 +1,7 @@
 # Author: Johannes Ranke <jranke@uni-bremen.de>
 
-# On Debian I used to run this script as root. On Ubuntu I now run it with 
-# sudo -E sh backport_others.sh
+# Run with (requires sudo configuration on Debian)
+# sudo -E ./backport_others.sh
 
 # Preconditions: - shell variables DIST and ARCH
 #                - current R backport in /etc/apt/sources/list of pbuilder chroot
@@ -13,31 +13,34 @@
 
 # R version against which the software is compiled
 Rversion=3.0.0
+reposversion="cran3"
 
 echo Distribution is $DIST
 echo Architecture is $ARCH
 
 text="Recompiled on $DIST for CRAN"
+rbasedev="r-base-dev (>= $Rversion~$DIST$reposversion.0)"
+echo $rbasedev
 
-apt-get update
+#apt-get update
 pbuilder update
 
 # single package:
-#for i in r-cran-rjags; do
+for i in boot; do
 # 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; do
+# squeeze/wheezy 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; 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-cran3 $text
+    dch -b -v $version --force-distribution -D $DIST-$reposversion $text
 
-    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
+    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
 
     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-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
+    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
     cd ..
 done
diff --git a/backport_r-base.sh b/backport_r-base.sh
index a0c2664..3dff4d1 100644
--- a/backport_r-base.sh
+++ b/backport_r-base.sh
@@ -5,8 +5,8 @@
 # Author: Johannes Ranke <jranke@uni-bremen.de>
 
 # Developed in parallel with Vincent Goulet <vincent.goulet@act.ulaval.ca>
-# On Debian I used to run this script as root. On Ubuntu I now run it with 
-# sudo -E sh backport_r-base.sh
+# Run with (requires sudo configuration on Debian)
+# sudo -E ./backport_r-base.sh
 
 # Preconditions: - shell variables DIST and ARCH
 #                - sid sources in /etc/apt/sources/list
@@ -37,15 +37,7 @@ cd r-base-*
 
 # Old version
 oldversion=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`
-cranversion=$oldversion"~"$DIST"cran.0"
-if [ $DIST = "squeeze" ]
-then
-  reposversion="cran3"
-fi
-if [ $DIST = "wheezy" ]
-then
-  reposversion="cran"
-fi
+reposversion="cran3"
 cranversion=$oldversion"~"$DIST$reposversion".0"
 
 echo Old version is $oldversion