summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--r-base/backport_r-base.sh5
1 files 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 <vincent.goulet@act.ulaval.ca>
# Modified for backporting to Debian etch by
# Johannes Ranke <jranke@uni-bremen.de>
-# Last Change: 2008 Apr 24
export DEBEMAIL="Johannes Ranke <jranke@uni-bremen.de>"
@@ -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

Contact - Imprint