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

4 files changed, 88 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"
diff --git a/backport_tcl.sh b/backport_tcl.sh
new file mode 100644
index 0000000..dd15577
--- /dev/null
+++ b/backport_tcl.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Script to automate backporting tcl8.6 for CRAN
+
+# Author: Johannes Ranke <jranke@uni-bremen.de>
+
+# Preconditions: - shell variables DIST and ARCH
+#                - sid sources in /etc/apt/sources/list
+#                - cdbs installed (and maybe more)
+
+export DEBEMAIL="jranke@uni-bremen.de"
+export DEBFULLNAME="Johannes Ranke"
+echo Distribution is $DIST
+echo Architecture is $ARCH
+
+if [ -d tcl8.6-* ]
+then
+    rm -rf `ls -d tcl8.6-*`
+fi
+
+apt-get update
+apt-get source tcl8.6
+
+cd tcl8.6-*
+
+# Old version
+oldversion=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`
+cranversion=$oldversion"~"$DIST"cran.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"
+
+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
+if [ $? -ne 0 ]; then
+    exit 
+fi
+
+cd ..
diff --git a/backport_tk.sh b/backport_tk.sh
new file mode 100644
index 0000000..35759eb
--- /dev/null
+++ b/backport_tk.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Script to automate backporting tk8.6 for CRAN
+
+# Author: Johannes Ranke <jranke@uni-bremen.de>
+
+# Preconditions: - shell variables DIST and ARCH
+#                - sid sources in /etc/apt/sources/list
+#                - cdbs installed (and maybe more)
+
+export DEBEMAIL="jranke@uni-bremen.de"
+export DEBFULLNAME="Johannes Ranke"
+echo Distribution is $DIST
+echo Architecture is $ARCH
+
+if [ -d tk8.6-* ]
+then
+    rm -rf `ls -d tk8.6-*`
+fi
+
+apt-get update
+apt-get source tk8.6
+
+cd tk8.6-*
+
+# Old version
+oldversion=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`
+cranversion=$oldversion"~"$DIST"cran.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"
+
+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
+if [ $? -ne 0 ]; then
+    exit 
+fi
+
+cd ..
diff --git a/clean.sh b/clean.sh
index 0eaca49..c76c4c9 100644
--- a/clean.sh
+++ b/clean.sh
@@ -6,5 +6,7 @@ for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-clas
     rm $i*.diff.gz # source package diffs from Debian unstable
 done
 rm -rf r-base*
+rm -rf tcl*
+rm -rf tk*
 rm -f *.build
 rm -f *.changes