Some changes that have accumulated

git-svn-id: svn+ssh://stiller/home/schatz/reps/r-backports@98 f247ebf9-aa24-0410-a698-f940e971ad2b

4 files changed, 19 insertions, 4 deletions

diff --git a/backport_others.sh b/backport_others.sh
index 78f650a..6c970af 100644
--- a/backport_others.sh
+++ b/backport_others.sh
@@ -31,7 +31,8 @@ pbuilder update
 # single package:
 #for i in rpy2; do
 # squeeze/wheezy packages:
-for i in lattice nlme rmatrix mgcv boot cluster codetools foreign kernsmooth r-cran-class r-cran-coda r-cran-spatial r-cran-nnet r-cran-mass rodbc rpart survival littler rpy rpy2 rkward r-cran-rjags; do
+for i in mgcv boot cluster codetools foreign kernsmooth r-cran-class r-cran-coda r-cran-spatial r-cran-nnet rodbc rpart littler rpy rpy2 rkward r-cran-rjags; do
+#for i in lattice nlme rmatrix mgcv boot cluster codetools foreign kernsmooth r-cran-class r-cran-coda r-cran-spatial r-cran-nnet r-cran-mass rodbc rpart survival littler rpy rpy2 rkward r-cran-rjags; do
     apt-get source $i
     cd $i-*
     version=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`~$DIST"cran."$Rversion
diff --git a/backport_r-base.sh b/backport_r-base.sh
index bab72a2..8c5b7e6 100644
--- a/backport_r-base.sh
+++ b/backport_r-base.sh
@@ -55,6 +55,13 @@ 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. TODO: 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
 
 pbuilder update --debootstrapopts "--keyring=/usr/share/keyrings/debian-archive-keyring.gpg"
diff --git a/build_others.sh b/build_others.sh
index e754e1b..72a0c53 100644
--- a/build_others.sh
+++ b/build_others.sh
@@ -6,9 +6,11 @@ apt-get upgrade
 # When doing a new repository, lattice, r-cran-mass and survival have to be
 # built first, then nlme and rmatrix, then the rest
 
-# squeeze/wheezy
-#for i in  rpy2; do
-for i in lattice rmatrix nlme cluster foreign r-cran-class r-cran-spatial r-cran-nnet r-cran-mass kernsmooth mgcv rodbc rpart survival littler rpy rpy2 rkward r-cran-rjags; do
+# squeeze/wheezy/jessie
+#for i in  lattice r-cran-mass survival; do
+#for i in  nlme rmatrix; do
+#for i in lattice rmatrix nlme cluster foreign r-cran-class r-cran-spatial r-cran-nnet r-cran-mass kernsmooth mgcv rodbc rpart survival littler rpy rpy2 rkward r-cran-rjags; do
+for i in cluster foreign r-cran-class r-cran-spatial r-cran-nnet kernsmooth mgcv rodbc rpart littler rpy rpy2 rkward r-cran-rjags; do
     apt-get --no-install-recommends build-dep $i
     apt-get source $i
     cd $i-*
diff --git a/move_jessie64.sh b/move_jessie64.sh
new file mode 100644
index 0000000..89c026b
--- /dev/null
+++ b/move_jessie64.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Move binary packages built in a chroot to the local repository
+
+mv *jessiecran*_amd64.deb ~/svn/website/www/ranke/r-cran/jessie-cran3