From 1b78f603b1e6a09171ab495a590c9dcd3377224f Mon Sep 17 00:00:00 2001
From: ranke <ranke@f247ebf9-aa24-0410-a698-f940e971ad2b>
Date: Fri, 11 Apr 2014 13:20:08 +0000
Subject: Updates and slight adaptions

git-svn-id: svn+ssh://stiller/home/schatz/reps/r-backports@95 f247ebf9-aa24-0410-a698-f940e971ad2b
---
 backport_others.sh | 4 ++--
 backport_r-base.sh | 4 ----
 build_others.sh    | 2 +-
 move_squeeze64.sh  | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/backport_others.sh b/backport_others.sh
index c3df538..2922447 100644
--- a/backport_others.sh
+++ b/backport_others.sh
@@ -13,7 +13,7 @@
 #                - Set the R version
 
 # R version against which the software is compiled
-Rversion=3.0.3
+Rversion=3.1.0
 reposversion="cran3"
 
 echo Distribution is $DIST
@@ -31,7 +31,7 @@ pbuilder update
 # built first, then nlme and rmatrix, then the rest
 
 # single package:
-#for i in r-cran-rjags; do
+#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
     apt-get source $i
diff --git a/backport_r-base.sh b/backport_r-base.sh
index 0ec3e76..bab72a2 100644
--- a/backport_r-base.sh
+++ b/backport_r-base.sh
@@ -46,10 +46,6 @@ echo CRAN version is $cranversion
 # Add new version to changelog
 dch -v "${cranversion}" --force-distribution -D $DIST-$reposversion -b "Backport from Debian unstable to Debian $DIST"
 
-# Revert changes Dirk needed for unstable
-sed -i '/FIXME/s/#.*FIXME //' debian/rules
-dch -a "debian/rules: Revert changes in dealing with info files Dirk needed for unstable"
-
 # Reverts for squeeze only:
 if [ $DIST = "squeeze" ]
 then
diff --git a/build_others.sh b/build_others.sh
index be63428..e754e1b 100644
--- a/build_others.sh
+++ b/build_others.sh
@@ -7,7 +7,7 @@ apt-get upgrade
 # built first, then nlme and rmatrix, then the rest
 
 # squeeze/wheezy
-#for i in  r-cran-rjags; do
+#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
     apt-get --no-install-recommends build-dep $i
     apt-get source $i
diff --git a/move_squeeze64.sh b/move_squeeze64.sh
index cd15364..33220ed 100644
--- a/move_squeeze64.sh
+++ b/move_squeeze64.sh
@@ -2,4 +2,4 @@
 
 # Move binary packages built in a chroot to the local repository
 
-mv *squeezecran*_amd64.deb ~/svn/website/www/ranke/r-cran/squeeze-cran3
+mv *squeezecran*_amd64.deb /home/ranke/svn/website/www/ranke/r-cran/squeeze-cran3
-- 
cgit v1.2.1