Update for todays backport of R 2.11.1, reincluding rpy.

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

12 files changed, 17 insertions, 255 deletions

diff --git a/backport_others.sh b/backport_others.sh
index f9c2bad..731ea29 100644
--- a/backport_others.sh
+++ b/backport_others.sh
@@ -7,13 +7,12 @@
 #                - 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
-#                  (don't forget distribution name) to the appropriate version of
-#                  r-base-dev
+#                - Edit R version and the sed scripts below (don't forget
+#                  distribution name) to the appropriate version of R
 #                - Set the R version
 
 # R version against which the software is compiled
-Rversion=2.11.0
+Rversion=2.11.1
 
 echo Distribution is $DIST
 echo Architecture is $ARCH
@@ -23,31 +22,27 @@ text="Recompiled on $DIST for CRAN"
 apt-get update
 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
+#for i in rpy; 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 rpy; do
     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
 
-    ssed -i -R '/^Build-Depends/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.11.0-1~etchcran.0)/' debian/control
-    ssed -i -R '/^Build-Depends-Indep/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.11.0-1~etchcran.0)/' debian/control
+    ssed -i -R '/^Build-Depends/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.11.1-1~etchcran.0)/' debian/control
+    ssed -i -R '/^Build-Depends-Indep/s/r-base-dev \(>= 2\..*?\)/r-base-dev (>= 2.11.1-1~etchcran.0)/' debian/control
 
     dch -a "debian/control: adapt build dependencies on r-base-dev to current backport"
 
-    # Reverts for etch:
-    if [ $DIST = "etch" ]
+    # Backport rpy
+    if [ ${i} = "rpy" ]
     then
-
-        # In newer packages from the former VR bundle and in the new r-cran-vr dummy
-        # package, there is a build dependency on debhelper >= 7.0.0, which is not
-        # in etch.
-
-        sed -i '/^Build-Depends/s/debhelper (>= 7.0.0)/debhelper/' debian/control
-        dch -a "debian/control: revert Build-Depends: to 'debhelper' since $DIST has a version < 7.0.0"
-
-        echo 5 > debian/compat
-        dch -a "debian/compat: revert 'debhelper' compatibility level to 5"
+      	sed -i '/^Build-Depends/s/debhelper (>= 7.2.17)/debhelper/' debian/control
+        dch -a "debian/control: revert Build-Depends: to 'debhelper' since lenny has a version of debhelper < 7.2.17"
+        sed -i '/^Build-Depends/s/python-numpy (>= 1:1.3.0)/python-numpy/' debian/control
+        dch -a "debian/control: revert Build-Depends: to 'python-numpy' since lenny has a version of python-numpy < 1.3.0"
+        sed -i '/^Depends/s/python-numpy (>= 1:1.3.0)/python-numpy/' debian/control
+        dch -a "debian/control: revert Depends: to 'python-numpy' since lenny has a version of python-numpy < 1.3.0"
     fi
 
     pdebuild --debbuildopts '-sa' --buildresult /home/ranke/svn/website/www/ranke/r-cran/$DIST-cran/ -- --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_others.sh b/build_others.sh
index 140a5a8..77ac7f9 100644
--- a/build_others.sh
+++ b/build_others.sh
@@ -14,7 +14,7 @@ apt-get update
 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
+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 rpy; do
     apt-get source $i
     cd $i-*
 
diff --git a/clean.sh b/clean.sh
index 9a7bf60..ec7d7f4 100644
--- a/clean.sh
+++ b/clean.sh
@@ -1,5 +1,5 @@
 # Author: Johannes Ranke <jranke@uni-bremen.de>
 
-for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-mass r-cran-nnet r-cran-spatial rmatrix rodbc rpart survival vr littler; do
+for i in boot cluster codetools foreign kernsmooth lattice mgcv nlme r-cran-class r-cran-mass r-cran-nnet r-cran-spatial rmatrix rodbc rpart survival vr littler rpy; do
     rm -rf $i*
 done
diff --git a/old/backport_rkward.sh b/old/backport_rkward.sh
deleted file mode 100644
index 8aa144c..0000000
--- a/old/backport_rkward.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Script to automate "backporting" of packages for Debian if the
-# only difference to the upstream packages is the signature.
-
-# For backporting rkward from the version 0.4.9a currently in testing, I
-# manually changed /etc/apt/sources list to this source package archive
-
-# Author: Johannes Ranke <jranke@uni-bremen.de>
-
-export DEBEMAIL=jranke@uni-bremen.de
-export DEBFULLNAME="Johannes Ranke"
-
-text="Recompiled on etch for CRAN"
-
-for i in rkward; do
-	cd $i
-	rm -rf $i*
-	rm *.deb
-    apt-get source $i
-    cd $i-*
-    version=`dpkg-parsechangelog | grep ^Version | cut -f2 -d " "`~etchcran.2.8.1
-    dch -b -v $version -D etch-cran $text
-
-    sed -i '/^Build-Depends/s/r-base-dev (.*)/r-base-dev (>= 2.8.1-1~etchcran.0)/' debian/control
-    dch -a "debian/control: adapt build dependencies on r-base-dev to current backport"
-
-    sed -i '/^#include "Rdevices.h"/d' rkward/rbackend/rembedinternal.cpp
-    dch -a "rkward/rbackend/rembedinternal.cpp: remove inclusion of obsolete Rdevices.h"
-
-    fakeroot dpkg-buildpackage -sa
-    cd ../..
-done
diff --git a/old/build_all_etch.sh b/old/build_all_etch.sh
deleted file mode 100644
index 954f07f..0000000
--- a/old/build_all_etch.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Script to automate building of r-cran-* packages for Debian for architectures
-# other than the originally backported i386 packages.  
-# This worked flawlessly for amd64 with the fresh R 2.8.1 backport to etch,
-# if an archive containing the backported source packages is the only deb-src
-# entry in /etc/apt/sources.list 
-# Last Change: 2008 Dez 30
-
-# Author: Johannes Ranke <jranke@uni-bremen.de> and
-
-for i in rmatrix rodbc; do
-#for i in cluster foreign kernsmooth lattice rmatrix mgcv nlme rodbc rpart survival vr littler; do
-	cd $i
-	rm -rf $i*
-	rm *.deb
-    apt-get source $i
-    cd $i-*
-    pdebuild
-    cd ../..
-done
diff --git a/old/build_all_lenny.sh b/old/build_all_lenny.sh
deleted file mode 100644
index 979ebe6..0000000
--- a/old/build_all_lenny.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Script to automate building of r-cran-* packages for Debian for architectures
-# other than the originally backported i386 packages.  
-# This worked flawlessly for amd64 with the fresh R 2.8.1 backport to etch,
-# if an archive containing the backported source packages is the only deb-src
-# entry in /etc/apt/sources.list 
-# Last Change: 2008 Dez 23
-
-# Author: Johannes Ranke <jranke@uni-bremen.de> and
-
-for i in rkward littler; do
-#for i in cluster foreign kernsmooth lattice mgcv nlme rodbc rpart survival vr littler rpy rkward; do
-	cd $i
-	rm -rf $i*
-	rm *.deb
-    apt-get source $i
-    cd $i-*
-    pdebuild
-    cd ../..
-done
diff --git a/old/publish_r-base.sh b/old/publish_r-base.sh
deleted file mode 100644
index e623912..0000000
--- a/old/publish_r-base.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-rsync -avz \
-	--include "build_log*" \
-	--include "build_errors*" \
-	--include "interdiff_to_debian_sid_$DIST" \
-	--include "r-base_*$DISTcran*.diff.gz" \
-	--include "r-base_*$DISTcran*.dsc" \
-	--include "*.deb" \
-	--exclude "*" \
-	r-base/ \
-	ranke@chem:/home/ranke/svn/website/www/ranke/r-cran/$DIST-cran
diff --git a/old/publish_the_rest.sh b/old/publish_the_rest.sh
deleted file mode 100644
index 5daf8c6..0000000
--- a/old/publish_the_rest.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Author: Johannes Ranke <jranke@uni-bremen.de>
-
-#scp {boot,cluster,codetools,foreign,kernsmooth,lattice,rmatrix,mgcv,nlme,rpart,survival,vr,rodbc,littler}/*.orig.tar.gz \
-    #chem:svn/website/www/ranke/r-cran/etch-cran
-scp -v {boot,cluster,codetools,foreign,kernsmooth,lattice,rmatrix,mgcv,nlme,rpart,survival,vr,rodbc,littler}/*etchcran* \
-    chem:svn/website/www/ranke/r-cran/etch-cran
diff --git a/r-doc-scripts/r-doc-html.postinst b/r-doc-scripts/r-doc-html.postinst
deleted file mode 100644
index 9f030a3..0000000
--- a/r-doc-scripts/r-doc-html.postinst
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-set -e
-
-#DEBHELPER#
-
-# Automatically added by dh_installdocs
-if [ "$1" = configure ] && which install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/r-admin
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = configure ] && which install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/r-faq
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = configure ] && which install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/r-ints
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = configure ] && which install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/r-data
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = configure ] && which install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/r-extensions
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = configure ] && which install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/r-language
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = configure ] && which install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/r-intro
-fi
-# End automatically added section
diff --git a/r-doc-scripts/r-doc-html.prerm b/r-doc-scripts/r-doc-html.prerm
deleted file mode 100644
index 811a7d8..0000000
--- a/r-doc-scripts/r-doc-html.prerm
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-set -e
-
-#DEBHELPER#
-
-# Automatically added by dh_installdocs
-if [ "$1" = remove ] || [ "$1" = upgrade ] && \
-   which install-docs >/dev/null 2>&1; then
-	install-docs -r r-admin
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = remove ] || [ "$1" = upgrade ] && \
-   which install-docs >/dev/null 2>&1; then
-	install-docs -r r-faq
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = remove ] || [ "$1" = upgrade ] && \
-   which install-docs >/dev/null 2>&1; then
-	install-docs -r r-ints
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = remove ] || [ "$1" = upgrade ] && \
-   which install-docs >/dev/null 2>&1; then
-	install-docs -r r-data
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = remove ] || [ "$1" = upgrade ] && \
-   which install-docs >/dev/null 2>&1; then
-	install-docs -r r-extensions
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = remove ] || [ "$1" = upgrade ] && \
-   which install-docs >/dev/null 2>&1; then
-	install-docs -r r-language
-fi
-# End automatically added section
-# Automatically added by dh_installdocs
-if [ "$1" = remove ] || [ "$1" = upgrade ] && \
-   which install-docs >/dev/null 2>&1; then
-	install-docs -r r-intro
-fi
-# End automatically added section
diff --git a/r-doc-scripts/r-doc-info.postinst b/r-doc-scripts/r-doc-info.postinst
deleted file mode 100644
index 77832e4..0000000
--- a/r-doc-scripts/r-doc-info.postinst
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# postinst script for the Debian GNU/Linux r-doc-info package
-# Initial version written by Douglas Bates <bates@stat.wisc.edu>
-# This version written by Dirk Eddelbuettel <edd@debian.org>   
-
-set -e
-
-#DEBHELPER#
-    
-case "$1" in
-    configure)
-	install-info --quiet --section "Programming" "R-FAQ" /usr/share/info/R-FAQ.info
-	install-info --quiet --section "Programming" "R-admin" /usr/share/info/R-admin.info
-	install-info --quiet --section "Programming" "R-data" /usr/share/info/R-data.info
-	install-info --quiet --section "Programming" "R-exts" /usr/share/info/R-exts.info
-	install-info --quiet --section "Programming" "R-intro" /usr/share/info/R-intro.info
-	install-info --quiet --section "Programming" "R-ints" /usr/share/info/R-ints.info
-	install-info --quiet --section "Programming" "R-lang" /usr/share/info/R-lang.info
-
-    ;;
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-    *)
-	echo "postinst called with unknown argument \`$1'" >&2
-    ;;
-esac
diff --git a/r-doc-scripts/r-doc-info.prerm b/r-doc-scripts/r-doc-info.prerm
deleted file mode 100644
index 95be602..0000000
--- a/r-doc-scripts/r-doc-info.prerm
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# prerm script for the Debian GNU/Linux r-doc-info package
-# This version written by Dirk Eddelbuettel <edd@debian.org>   
-
-set -e
-
-#DEBHELPER#
-    
-case "$1" in
-    remove|purge)
-	install-info --quiet --remove R-FAQ
-	install-info --quiet --remove R-admin
-	install-info --quiet --remove R-data
-	install-info --quiet --remove R-exts
-	install-info --quiet --remove R-intro
-	install-info --quiet --remove R-ints
-	install-info --quiet --remove R-lang
-    ;;
-    upgrade|abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-    *)
-	echo "prerm called with unknown argument \`$1'" >&2
-    ;;
-esac