summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README5
-rw-r--r--backport_r-base.sh18
2 files changed, 20 insertions, 3 deletions
diff --git a/README b/README
index 46af6d3..bb26e4e 100644
--- a/README
+++ b/README
@@ -26,3 +26,8 @@ These have a standard Debian mirror, the security sources and the Debian
backports repository setup in their /etc/apt/sources.list, as well as my local
http package source where the r-base package build results are available. I
have also imported the apt key of my repository inside the pbuilder chroots.
+
+In the wheezey pbuilder images, the backports repository is not necessary.
+
+When using these scripts on Debian, I configure sudo to allow my normal user to use pbuilder, apt-get
+and the backporting scripts
diff --git a/backport_r-base.sh b/backport_r-base.sh
index d2a08f1..a0c2664 100644
--- a/backport_r-base.sh
+++ b/backport_r-base.sh
@@ -38,23 +38,35 @@ 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
+cranversion=$oldversion"~"$DIST$reposversion".0"
echo Old version is $oldversion
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"
+dch -v "${cranversion}" --force-distribution -D $DIST-$reposversion -b "Backport from Debian unstable to Debian $DIST"
-# Reverts for squeeze:
+# Reverts for squeeze only:
+if [ $DIST = "squeeze" ]
+then
# 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.
sed -i '/^Build-Depends/s/libtiff5-dev/libtiff-dev/' debian/control
dch -a "debian/control: Change Build-Depends: from libtiff5-dev to libtiff-dev"
+fi
pbuilder update
-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
if [ $? -ne 0 ]; then
exit
fi

Contact - Imprint