Update for the backport of R 2.11.0 to etch

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

4 files changed, 9 insertions, 8 deletions

diff --git a/backport_others.sh b/backport_others.sh
index bd33e75..f9c2bad 100644
--- a/backport_others.sh
+++ b/backport_others.sh
@@ -4,11 +4,12 @@
 # sudo -E sh backport_others.sh
 
 # Preconditions: - shell variables DIST and ARCH
-#                - sources for current R backport in /etc/apt/sources/list
+#                - current R backport in /etc/apt/sources/list
 #                - sid sources in /etc/apt/sources/list
 #                - ssed and cdbs installed (and maybe more)
 #                - Edit the sed scripts below to adapt the build dependencies
-#                  to the appropriate version of r-base-dev
+#                  (don't forget distribution name) to the appropriate version of
+#                  r-base-dev
 #                - Set the R version
 
 # R version against which the software is compiled
@@ -24,7 +25,7 @@ pbuilder update
 
 #for i in vr; do
 for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-spatial r-cran-nnet r-cran-mass rmatrix rodbc rpart survival littler; do
-    apt-get source -t unstable $i
+    apt-get source $i
     cd $i-*
     version=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`~$DIST"cran".$Rversion
     dch -b -v $version --force-distribution -D $DIST-cran $text
diff --git a/backport_r-base.sh b/backport_r-base.sh
index f5403f2..fa07ab9 100644
--- a/backport_r-base.sh
+++ b/backport_r-base.sh
@@ -23,7 +23,7 @@ then
 fi
 
 apt-get update
-apt-get source -t unstable r-base
+apt-get source r-base
 
 # Change any ~ in the name of the build directory for a - to avoid a
 # bug in texi2dvi. Thanks Vincent
diff --git a/build_others.sh b/build_others.sh
index 5791ad3..140a5a8 100644
--- a/build_others.sh
+++ b/build_others.sh
@@ -4,7 +4,7 @@
 # sudo -E sh build_others.sh
 
 # Preconditions: - shell variables DIST and ARCH
-#                - CRAN sources in /etc/apt/sources/list
+#                - matching CRAN sources in /etc/apt/sources/list
 #                - cdbs installed (and maybe more)
 
 echo Distribution is $DIST
@@ -15,7 +15,7 @@ pbuilder update
 
 #for i in littler; do
 for i in cluster foreign lattice mgcv nlme r-cran-class r-cran-spatial r-cran-nnet r-cran-mass kernsmooth rmatrix rodbc rpart survival littler; do
-    apt-get source -t $DIST-cran $i
+    apt-get source $i
     cd $i-*
 
     pdebuild --buildresult /home/ranke/svn/website/www/ranke/r-cran/$DIST-cran/ -- --binary-arch --distribution $DIST --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache --buildplace /var/cache/pbuilder/$DIST-$ARCH/build
diff --git a/build_r-base.sh b/build_r-base.sh
index 2d09f22..18dc8aa 100644
--- a/build_r-base.sh
+++ b/build_r-base.sh
@@ -8,14 +8,14 @@
 # sudo -E sh build_r-base.sh
 
 # Preconditions: - shell variables DIST and ARCH
-#                - CRAN sources in /etc/apt/sources/list
+#                - matching CRAN sources in /etc/apt/sources/list
 #                - cdbs installed (and maybe more)
 
 echo Distribution is $DIST
 echo Architecture is $ARCH
 
 apt-get update
-apt-get source -t $DIST-cran r-base
+apt-get source r-base
 
 cd r-base-*