From 9dcfbe646328d3c09372d3fce26b8c1981ce7058 Mon Sep 17 00:00:00 2001 From: ranke Date: Tue, 23 Dec 2008 23:32:26 +0000 Subject: I don't have the energy to produce the corrected packages - hopefully arm and hppa administrators will not stumble over this git-svn-id: svn+ssh://stiller/home/schatz/reps/r-backports@46 f247ebf9-aa24-0410-a698-f940e971ad2b --- r-base/backport_r-base.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/r-base/backport_r-base.sh b/r-base/backport_r-base.sh index 701686b..beace88 100644 --- a/r-base/backport_r-base.sh +++ b/r-base/backport_r-base.sh @@ -7,7 +7,6 @@ # Author: Vincent Goulet # Modified for backporting to Debian etch by # Johannes Ranke -# Last Change: 2008 Apr 24 export DEBEMAIL="Johannes Ranke " @@ -19,7 +18,7 @@ cd r-base-* # Old version oldversion=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "` -cranversion=$oldversion"~etchcran.0" +cranversion=$oldversion"~etchcran.1" # Add new version to changelog dch -v "${cranversion}" -D etch-cran -b "Backport form Debian unstable to Debian etch" @@ -77,7 +76,7 @@ dch -a "debian/control: revert build dependence for tcl/tk to 8.4" # 7. Openjdk is not in etch -sed -i '/^Build-Depends/s/, openjdk-6-jdk//' debian/control +sed -i '/^Build-Depends/s/, openjdk-6-jdk [!arm !hppa]//' debian/control dch -a "debian/control: Remove build dependence on openjdk" # Build package showing all messages and separating output to build and error logs -- cgit v1.2.1