Update of the build scripts after adding the R 2.10.0 backport to etch

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

3 files changed, 24 insertions, 8 deletions

diff --git a/backport_others.sh b/backport_others.sh
index ba2a1a1..534c977 100644
--- a/backport_others.sh
+++ b/backport_others.sh
@@ -4,6 +4,7 @@
 # sudo -E sh backport_others.sh
 
 # Preconditions: - shell variables DIST and ARCH
+#                - sources for current R backport in /etc/apt/sources/list
 #                - sid sources in /etc/apt/sources/list
 #                - ssed and cdbs installed (and maybe more)
 #                - Edit the sed scripts below to adapt the build dependencies
@@ -21,18 +22,33 @@ text="Recompiled on $DIST for CRAN"
 apt-get update
 pbuilder update
 
-#for i in nlme; 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 vr; 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
     apt-get source -t unstable $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.10.0-1~lennycran.0)/' debian/control
-    ssed -i -R '/^Build-Depends-Indep/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.10.0-1~lennycran.0)/' debian/control
+    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
 
     dch -a "debian/control: adapt build dependencies on r-base-dev to current backport"
 
+    # Reverts for etch:
+    if [ $DIST = "etch" ]
+    then
+
+        # In newer packages from the former VR bundle and in the new r-cran-vr dummy
+        # package, there is a build dependency on debhelper >= 7.0.0, which is not
+        # in etch.
+
+        sed -i '/^Build-Depends/s/debhelper (>= 7.0.0)/debhelper/' debian/control
+        dch -a "debian/control: revert Build-Depends: to 'debhelper' since $DIST has a version < 7.0.0"
+
+        echo 5 > debian/compat
+        dch -a "debian/compat: revert 'debhelper' compatibility level to 5"
+    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/backport_r-base.sh b/backport_r-base.sh
index 937ced0..03b5f00 100644
--- a/backport_r-base.sh
+++ b/backport_r-base.sh
@@ -22,7 +22,7 @@ then
     rm -rf `ls -d r-base-*`
 fi
 
-#apt-get update
+apt-get update
 apt-get source -t unstable r-base
 
 # Change any ~ in the name of the build directory for a - to avoid a
diff --git a/build_others.sh b/build_others.sh
index 21da734..d56cdb8 100644
--- a/build_others.sh
+++ b/build_others.sh
@@ -10,11 +10,11 @@
 echo Distribution is $DIST
 echo Architecture is $ARCH
 
-#apt-get update
+apt-get update
 pbuilder update
 
-#for i in nlme; do
-#for i in cluster foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-spatial r-cran-nnet r-cran-massrmatrix rodbc rpart survival littler; do
+#for i in 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; do
     apt-get source -t $DIST-cran $i
     cd $i-*