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

1 files changed, 2 insertions, 30 deletions

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