summaryrefslogtreecommitdiff
path: root/backport_r-base.sh
diff options
context:
space:
mode:
authorranke <ranke@f247ebf9-aa24-0410-a698-f940e971ad2b>2015-03-10 08:48:46 +0000
committerranke <ranke@f247ebf9-aa24-0410-a698-f940e971ad2b>2015-03-10 08:48:46 +0000
commitcdd76a1b89c14b5756dd8ccac24ec58566c4cd54 (patch)
tree7d09620b5e9536f4e36a5549c744caa31b389256 /backport_r-base.sh
parentf548507978acbdfa313717b3caedfdae78ad3f9a (diff)
Backport tcl/tk 8.6 as well in order to avoid losing functionality or other problems
git-svn-id: svn+ssh://stiller/home/schatz/reps/r-backports@101 f247ebf9-aa24-0410-a698-f940e971ad2b
Diffstat (limited to 'backport_r-base.sh')
-rw-r--r--backport_r-base.sh15
1 files changed, 2 insertions, 13 deletions
diff --git a/backport_r-base.sh b/backport_r-base.sh
index a71b351..86c227c 100644
--- a/backport_r-base.sh
+++ b/backport_r-base.sh
@@ -56,19 +56,8 @@ then
sed -i '/^Build-Depends/s/libtiff5-dev/libtiff-dev/' debian/control
dch -a "debian/control: Change Build-Depends: from libtiff5-dev to libtiff-dev"
- # 2. Revert build dependencies for tcl 8.6 and tk 8.6
- # Versions 8.4 are default in squeeze, 8.5 in wheezy
- sed -i '/^Build-Depends/s/tcl8.6-dev/tcl8.4-dev/' debian/control
- sed -i '/^Build-Depends/s/tk8.6-dev/tk8.4-dev/' debian/control
- dch -a "debian/control: Change Build-Depends: from tcl8.6-dev to tcl8.4-dev"
- dch -a "debian/control: Change Build-Depends: from tk8.6-dev to tk8.4-dev"
-fi
-
-# Reverts for wheezy:
-if [ $DIST = "wheezy" ]
-then
- # 1. Revert build dependencies for tcl 8.6 and tk 8.6
- # Versions 8.4 are default in squeeze, 8.5 in wheezy
+ # 2. Lower build dependencies for tcl 8.6 and tk 8.6
+ # which are not available in squeeze
sed -i '/^Build-Depends/s/tcl8.6-dev/tcl8.5-dev/' debian/control
sed -i '/^Build-Depends/s/tk8.6-dev/tk8.5-dev/' debian/control
dch -a "debian/control: Change Build-Depends: from tcl8.6-dev to tcl8.5-dev"

Contact - Imprint