Updated backport script.

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

3 files changed, 8 insertions, 29 deletions

diff --git a/backport_jags.sh b/backport_jags.sh
index 288f787..f4ab3f1 100644
--- a/backport_jags.sh
+++ b/backport_jags.sh
@@ -36,10 +36,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:
-# None at present
-
-# Reverts for lenny only:
+# 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
diff --git a/backport_others.sh b/backport_others.sh
index 968fe97..ceb012c 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.13.1
+Rversion=2.13.2
 
 echo Distribution is $DIST
 echo Architecture is $ARCH
@@ -22,37 +22,19 @@ text="Recompiled on $DIST for CRAN"
 apt-get update
 pbuilder update
 
-for i in r-cran-rjags; do
+#for i in 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; 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 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 r-cran-rjags; 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
 
-    ssed -i -R '/^Build-Depends/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.13.1-1~lennycran.0)/' debian/control
-    ssed -i -R '/^Build-Depends-Indep/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.13.1-1~lennycran.0)/' debian/control
+    ssed -i -R '/^Build-Depends/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.13.2-1~squeezecran.0)/' debian/control
+    ssed -i -R '/^Build-Depends-Indep/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.13.2-1~squeezecran.0)/' debian/control
 
     dch -a "debian/control: adapt build dependencies on r-base-dev to current backport"
 
-    # Backport r-cran-class
-    if [ ${i} = "r-cran-class" ]
-    then
-      	sed -i '/^Build-Depends/s/.*/&, r-cran-mass/' debian/control
-        dch -a "debian/control: add Build-Depends: to 'r-cran-mass'"
-    fi
-
-    # Backport rpy
-    if [ ${i} = "rpy" ]
-    then
-      	sed -i '/^Build-Depends/s/debhelper (>= 7.2.17)/debhelper/' debian/control
-        dch -a "debian/control: revert Build-Depends: to 'debhelper' since lenny has a version of debhelper < 7.2.17"
-        sed -i '/^Build-Depends/s/python-numpy (>= 1:1.3.0)/python-numpy/' debian/control
-        dch -a "debian/control: revert Build-Depends: to 'python-numpy' since lenny has a version of python-numpy < 1.3.0"
-        sed -i '/^Depends/s/python-numpy (>= 1:1.3.0)/python-numpy/' debian/control
-        dch -a "debian/control: revert Depends: to 'python-numpy' since lenny has a version of python-numpy < 1.3.0"
-    fi
-
     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
     cd ..
 done
diff --git a/build_others.sh b/build_others.sh
index 835b05e..95d68f4 100644
--- a/build_others.sh
+++ b/build_others.sh
@@ -14,8 +14,8 @@ apt-get update
 pbuilder update
 
 #for i in r-cran-rjags; do
-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
-#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
+#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
+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
     apt-get source $i
     cd $i-*