diff options
| -rw-r--r-- | backport_all.sh | 13 | ||||
| -rw-r--r-- | backport_rkward.sh | 12 | ||||
| -rw-r--r-- | publish_r-base.sh | 5 | ||||
| -rw-r--r-- | r-base/backport_r-base.sh | 6 |
4 files changed, 27 insertions, 9 deletions
diff --git a/backport_all.sh b/backport_all.sh index 3235e2c..593b930 100644 --- a/backport_all.sh +++ b/backport_all.sh @@ -10,18 +10,18 @@ export DEBFULLNAME="Johannes Ranke" text="Recompiled on etch for CRAN" -for i in rodbc; do -#for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme rodbc rpart survival vr littler rpy; do +#for i in rpy; do +for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme rodbc rpart survival vr littler rpy; do cd $i rm -rf $i* rm *.deb apt-get source -t unstable $i cd $i-* - version=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`~etchcran.2.7.1 + version=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`~etchcran.2.8.0 dch -b -v $version -D etch-cran $text - sed -i '/^Build-Depends/s/r-base-dev (.*)/r-base-dev (>= 2.7.1-1~etchcran.0)/' debian/control - sed -i '/^Build-Depends-Indep/s/r-base-dev (.*)/r-base-dev (>= 2.7.1-1~etchcran.0)/' debian/control + sed -i '/^Build-Depends/s/r-base-dev (.*)/r-base-dev (>= 2.8.0-1~etchcran.0)/' debian/control + sed -i '/^Build-Depends-Indep/s/r-base-dev (.*)/r-base-dev (>= 2.8.0-1~etchcran.0)/' debian/control dch -a "debian/control: adapt build dependencies on r-base-dev to current backport" if [ ${i} == "rpy" ] @@ -29,6 +29,9 @@ for i in rodbc; do sed -i '/^Build-Depends/s/texlive-base, texlive-latex-base/tetex-bin, tetex-extra, lapack3-dev/' debian/control dch -a "debian/control: revert Build-Depends: to 'tetex-bin, tetex-extra'" dch -a "debian/control: add build dependency on 'lapack3-dev'" + + sed -i '/^#include <Rdevices.h> */d' src/RPy.h + dch -a "src/RPy.h: remove inclusion of obsolete Rdevices.h" fi fakeroot dpkg-buildpackage -sa diff --git a/backport_rkward.sh b/backport_rkward.sh index 44b23be..fdf64d9 100644 --- a/backport_rkward.sh +++ b/backport_rkward.sh @@ -3,6 +3,9 @@ # Script to automate "backporting" of packages for Debian if the # only difference to the upstream packages is the signature. +# For backporting rkward from the version 0.4.9a currently in testing, I +# manually changed /etc/apt/sources list to this source package archive + # Author: Johannes Ranke <jranke@uni-bremen.de> export DEBEMAIL=jranke@uni-bremen.de @@ -14,14 +17,17 @@ for i in rkward; do cd $i rm -rf $i* rm *.deb - apt-get source -t lenny $i + apt-get source $i cd $i-* - version=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`~etchcran.2.7.1 + version=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`~etchcran.2.8.0 dch -b -v $version -D etch-cran $text - sed -i '/^Build-Depends/s/r-base-dev (.*)/r-base-dev (>= 2.7.1-1~etchcran.0)/' debian/control + sed -i '/^Build-Depends/s/r-base-dev (.*)/r-base-dev (>= 2.8.0-1~etchcran.0)/' debian/control dch -a "debian/control: adapt build dependencies on r-base-dev to current backport" + sed -i '/^#include "Rdevices.h"/d' rkward/rbackend/rembedinternal.cpp + dch -a "rkward/rbackend/rembedinternal.cpp: remove inclusion of obsolete Rdevices.h" + fakeroot dpkg-buildpackage -sa cd ../.. done diff --git a/publish_r-base.sh b/publish_r-base.sh index 58e88dc..f9c5582 100644 --- a/publish_r-base.sh +++ b/publish_r-base.sh @@ -1,7 +1,10 @@ #!/bin/bash rsync -az \ - --include "build_*" \ + --include "build_log*" \ + --include "build_errors*" \ --include "interdiff_to_debian_sid" \ + --include "r-base_*etchcran*.diff.gz" \ + --include "r-base_*etchcran*.dsc" \ --include "*.orig.tar.gz" \ --include "*.deb" \ --exclude "*" \ diff --git a/r-base/backport_r-base.sh b/r-base/backport_r-base.sh index e8e0fac..62dc282 100644 --- a/r-base/backport_r-base.sh +++ b/r-base/backport_r-base.sh @@ -69,6 +69,12 @@ dch -a "debian/control: revert Build-Depends: to 'tetex-bin, tetex-extra' since sed -i '/^Build-Depends/s/xauth/xbase-clients/' debian/control dch -a "debian/control: replace xauth by xbase-clients in Build-Depends:" +# 6. Tcl and TK are 8.4 on Debian etch + +sed -i '/^Build-Depends/s/ tcl8.5-dev/tcl8.4-dev/' debian/control +sed -i '/^Build-Depends/s/ tk8.5-dev/tk8.4-dev/' debian/control +dch -a "debian/control: revert build dependence for tcl/tk to 8.4" + # Build package showing all messages and separating output to build and error logs (dpkg-buildpackage -tc | tee ../build_log_r-base_i386) 3>&1 1>&2 2>&3 | tee ../build_errors_r-base_i386 if [ $? -ne 0 ]; then |