bring up to date with cran box config

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@186 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

diff --git a/trunk/inst/doc/README b/trunk/inst/doc/README
index 25a278400c0fd6f3a81858631b2756bc75e25944..7065dbe74ef049459741de7c912cb944d3cb8dc7 100644 (file)
--- a/trunk/inst/doc/README
+++ b/trunk/inst/doc/README
@@ -16,13 +16,15 @@ Let ROOT be the value returned by running: cran2deb root
 Let SYS be the system you wish to build for (e.g., debian-amd64)
 
 2. create /etc/cran2deb
-   a. copy ROOT/etc/* into /etc/cran2deb/sys/SYS/
-   b. /etc/cran2deb/archive should be a symlink pointing to /var/www/cran2deb/
+   a. copy ROOT/etc/* into /etc/cran2deb/
+   b. ensure ROOT/etc/sys/SYS is set up
+   c. /etc/cran2deb/archive should be a symlink pointing to /var/www/cran2deb/
 
     $ ln -s /var/www/cran2deb/ /etc/cran2deb/archive
     $ mkdir /var/www/cran2deb/SYS
 
-   c. modify OTHERMIRROR of /etc/cran2deb/pbuilderrc.in to point to your webserver
+   d. modify OTHERMIRROR of /etc/cran2deb/sys/SYS/pbuilderrc.in to point to your webserver
+   e. run: cran2deb repopulate
 
 3. cran2deb needs a persistent cache outside of R's control. therefore, create
     /var/cache/cran2deb, writable by whichever user(s) will run cran2deb.

diff --git a/trunk/inst/etc/dput.cf.in b/trunk/inst/etc/dput.cf.in
deleted file mode 100644 (file)
index 8ae0ca6..0000000
--- a/trunk/inst/etc/dput.cf.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[local]
-method = local
-incoming = /etc/cran2deb/archive/mini-dinstall/incoming
-allow_non-us_software = 1
-run_dinstall = 0
-run_lintian = 1
-post_upload_command = /usr/bin/mini-dinstall --batch -c /etc/cran2deb/mini-dinstall.conf
-allow_unsigned_uploads = 1

diff --git a/trunk/inst/etc/hook/A80rjava b/trunk/inst/etc/hook/A80rjava
deleted file mode 100755 (executable)
index 1d37c8b..0000000
--- a/trunk/inst/etc/hook/A80rjava
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ -n "$(which java)" ]
-then
-    R CMD javareconf
-fi

diff --git a/trunk/inst/etc/hook/B90lintian b/trunk/inst/etc/hook/B90lintian
deleted file mode 100755 (executable)
index 57fcfc4..0000000
--- a/trunk/inst/etc/hook/B90lintian
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# example file to be used with --hookdir
-#
-# run lintian on generated deb files
-apt-get install -y --force-yes lintian
-lintian /tmp/buildd/*.deb

diff --git a/trunk/inst/etc/hook/B91dpkg-i b/trunk/inst/etc/hook/B91dpkg-i
deleted file mode 100755 (executable)
index ee031bb..0000000
--- a/trunk/inst/etc/hook/B91dpkg-i
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# example file to be used with --hookdir
-#
-# try to install the resulting debs.
-
-echo "Trying to install resulting packages and test upgrades"
-set -ex
-
-
-PKGNAMES=$(cd /tmp/buildd && ls -1 *.deb | sed 's/_.*$//' )
-
-# install-remove check
-dpkg -i /tmp/buildd/*.deb
-dpkg --remove $PKGNAMES
-
-# install-purge check
-dpkg -i /tmp/buildd/*.deb
-dpkg --purge $PKGNAMES
-
-# upgrade-remove check
-apt-get install -y --force-yes  $PKGNAMES || true
-dpkg -i /tmp/buildd/*.deb
-dpkg --remove $PKGNAMES
-
-# upgrade-purge check
-apt-get install -y --force-yes $PKGNAMES || true
-dpkg -i /tmp/buildd/*.deb
-dpkg --purge $PKGNAMES

diff --git a/trunk/inst/etc/hook/B92test-pkg b/trunk/inst/etc/hook/B92test-pkg
deleted file mode 100755 (executable)
index 7372ca0..0000000
--- a/trunk/inst/etc/hook/B92test-pkg
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-# example file to be used with --hookdir
-#
-# run tests. Current directory is top of source-code.
-#
-# 2005, 2007 Junichi Uekawa
-# 
-set -e 
-
-echo "Installing the prerequisites"
-for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do
-    apt-get install -y --force-yes "$PKG" || true 
-    apt-get remove -y "$PKG" || true 
-done
-# ignore the failures since they are not the prime interest
-
-dpkg -i /tmp/buildd/*.deb
-
-if chmod a+x /tmp/buildd/*/debian/pbuilder-test/*; then
-    :
-else
-    echo "W: no pbuilder-test script found, skipping"
-    exit 0
-fi
-
-SUCCESS=0
-COUNT=0
-unset FAIL || true
-NOFAIL=1
-
-# The current directory is the top of the source-tree.
-cd /tmp/buildd/*/debian/..
-
-for SCRIPT in $(run-parts --test /tmp/buildd/*/debian/pbuilder-test) ; do
-    echo "--- BEGIN test: ${SCRIPT##*/}"
-    if "${SCRIPT}"; then
-       echo SUCCESS
-       ((SUCCESS=SUCCESS+1))
-    else
-       echo FAIL
-       FAIL[${#FAIL[@]}]="${SCRIPT##*/}"
-       NOFAIL=0
-    fi
-    echo "--- END test: ${SCRIPT##*/}"
-    ((COUNT=COUNT+1))
-done
-
-echo "Summary:"
-echo "=== $SUCCESS out of $COUNT tests passed"
-echo "${FAIL[@]/#/ failed }"
-echo "-- end of testsuite."
-

diff --git a/trunk/inst/etc/hook/D70aptupdate b/trunk/inst/etc/hook/D70aptupdate
deleted file mode 100755 (executable)
index 4d42b3d..0000000
--- a/trunk/inst/etc/hook/D70aptupdate
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/apt-get update

diff --git a/trunk/inst/etc/mini-dinstall.conf.in b/trunk/inst/etc/mini-dinstall.conf.in
deleted file mode 100644 (file)
index 56cd938..0000000
--- a/trunk/inst/etc/mini-dinstall.conf.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[DEFAULT]
-architectures = all, i386, amd64
-use_dnotify = 0
-verify_sigs = 0
-mail_on_success = 0
-archive_style = simple-subdir
-mail_log_level = NONE
-archivedir = /etc/cran2deb/archive
-logfile = @ROOT@/mini-dinstall.log
-
-[unstable]
-

diff --git a/trunk/inst/etc/patches/CGIwithR/00_usr_local_shebang.patch b/trunk/inst/etc/patches/CGIwithR/00_usr_local_shebang.patch
new file mode 100644 (file)
index 0000000..ce81d47
--- /dev/null
+++ b/trunk/inst/etc/patches/CGIwithR/00_usr_local_shebang.patch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_use_local_shebang.dpatch by  <cb@xmcorsairs.wu-wien.ac.at>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove /usr/local from #!
+
+@DPATCH@
+
+diff -Naur CGIwithR.orig/inst/examples/dangerous.R CGIwithR/inst/examples/dangerous.R
+--- CGIwithR.orig/inst/examples/dangerous.R    2005-11-23 16:07:08.000000000 +0000
++++ CGIwithR/inst/examples/dangerous.R 2008-09-13 15:11:14.000000000 +0000
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/R  
++#! /usr/bin/R  
+ 
+ ###  An example CGI script in R
+ ###
+diff -Naur CGIwithR.orig/inst/examples/trivial.R CGIwithR/inst/examples/trivial.R
+--- CGIwithR.orig/inst/examples/trivial.R      2005-11-23 16:07:08.000000000 +0000
++++ CGIwithR/inst/examples/trivial.R   2008-09-13 15:11:24.000000000 +0000
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/R
++#! /usr/bin/R
+ 
+ tag(HTML)
+     tag(HEAD)

diff --git a/trunk/inst/etc/patches/CGIwithR/00list b/trunk/inst/etc/patches/CGIwithR/00list
new file mode 100644 (file)
index 0000000..f951dda
--- /dev/null
+++ b/trunk/inst/etc/patches/CGIwithR/00list
@@ -0,0 +1 @@
+00_usr_local_shebang.patch

diff --git a/trunk/inst/etc/pbuilderrc.in b/trunk/inst/etc/pbuilderrc.in
deleted file mode 100644 (file)
index 076ee17..0000000
--- a/trunk/inst/etc/pbuilderrc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-BASETGZ=/var/cache/pbuilder/base-cran2deb.tgz
-HOOKDIR=/etc/cran2deb/hook
-BUILDRESULT=/var/cache/cran2deb/results
-EXTRAPACKAGES='debhelper r-base-dev cdbs r-base-core lintian xvfb xauth xfonts-base'
-REMOVEPACKAGES='lilo libldap-2.4-2 libopencdk10 libsasl2-2'
-# don't actually need aptitude, but pbuilder insists...
-#REMOVEPACKAGES+='aptitude libcwidget3 libept0 libncursesw5 libsigc++-2.0-0c2a libxapian15'
-DISTRIBUTION=unstable
-OTHERMIRROR='deb http://localhost/users/cb/cran2deb/ unstable/$(ARCH)/ | deb http://localhost/users/cb/cran2deb/ unstable/all/'
-MIRRORSITE='http://ftp.debian.org/debian/'
-APTCACHE=''
-PBUILDERSATISFYDEPENDSCMD='/usr/lib/pbuilder/pbuilder-satisfydepends-classic'

diff --git a/trunk/inst/etc/sys/debian-amd64/dput.cf b/trunk/inst/etc/sys/debian-amd64/dput.cf
new file mode 100644 (file)
index 0000000..05bfbd4
--- /dev/null
+++ b/trunk/inst/etc/sys/debian-amd64/dput.cf
@@ -0,0 +1,8 @@
+[local]
+method = local
+incoming = /etc/cran2deb/archive/debian-amd64/mini-dinstall/incoming
+allow_non-us_software = 1
+run_dinstall = 0
+run_lintian = 1
+post_upload_command = /usr/bin/mini-dinstall --batch -c /etc/cran2deb/sys/debian-amd64/mini-dinstall.conf
+allow_unsigned_uploads = 1

diff --git a/trunk/inst/etc/sys/debian-amd64/mini-dinstall.conf b/trunk/inst/etc/sys/debian-amd64/mini-dinstall.conf
new file mode 100644 (file)
index 0000000..471a138
--- /dev/null
+++ b/trunk/inst/etc/sys/debian-amd64/mini-dinstall.conf
@@ -0,0 +1,12 @@
+[DEFAULT]
+architectures = all, i386, amd64
+use_dnotify = 0
+verify_sigs = 0
+mail_on_success = 0
+archive_style = simple-subdir
+mail_log_level = NONE
+archivedir = /etc/cran2deb/archive/debian-amd64
+logfile = /dev/null
+
+[unstable]
+

diff --git a/trunk/inst/etc/sys/debian-amd64/pbuilderrc b/trunk/inst/etc/sys/debian-amd64/pbuilderrc
new file mode 100644 (file)
index 0000000..4bac7fc
--- /dev/null
+++ b/trunk/inst/etc/sys/debian-amd64/pbuilderrc
@@ -0,0 +1,12 @@
+BASETGZ=/var/cache/pbuilder/base-cran2deb-debian-amd64.tgz
+HOOKDIR=/etc/cran2deb/hook
+BUILDRESULT=/var/cache/cran2deb/results/debian-amd64
+EXTRAPACKAGES='debhelper r-base-dev cdbs r-base-core lintian xvfb xauth xfonts-base'
+REMOVEPACKAGES='lilo libldap-2.4-2 libopencdk10 libsasl2-2'
+# don't actually need aptitude, but pbuilder insists...
+#REMOVEPACKAGES+='aptitude libcwidget3 libept0 libncursesw5 libsigc++-2.0-0c2a libxapian15'
+DISTRIBUTION=unstable
+OTHERMIRROR='deb http://localhost/cran2deb/debian-amd64 unstable/$(ARCH)/ | deb http://localhost/cran2deb/debian-amd64 unstable/all/'
+MIRRORSITE='http://ftp.at.debian.org/debian/'
+APTCACHE=''
+PBUILDERSATISFYDEPENDSCMD='/usr/lib/pbuilder/pbuilder-satisfydepends-classic'

diff --git a/trunk/inst/etc/sys/debian-i386/dput.cf b/trunk/inst/etc/sys/debian-i386/dput.cf
new file mode 100644 (file)
index 0000000..3d76e3c
--- /dev/null
+++ b/trunk/inst/etc/sys/debian-i386/dput.cf
@@ -0,0 +1,8 @@
+[local]
+method = local
+incoming = /etc/cran2deb/archive/debian-i386/mini-dinstall/incoming
+allow_non-us_software = 1
+run_dinstall = 0
+run_lintian = 1
+post_upload_command = /usr/bin/mini-dinstall --batch -c /etc/cran2deb/sys/debian-i386/mini-dinstall.conf
+allow_unsigned_uploads = 1

diff --git a/trunk/inst/etc/sys/debian-i386/mini-dinstall.conf b/trunk/inst/etc/sys/debian-i386/mini-dinstall.conf
new file mode 100644 (file)
index 0000000..c948ba8
--- /dev/null
+++ b/trunk/inst/etc/sys/debian-i386/mini-dinstall.conf
@@ -0,0 +1,12 @@
+[DEFAULT]
+architectures = all, i386
+use_dnotify = 0
+verify_sigs = 0
+mail_on_success = 0
+archive_style = simple-subdir
+mail_log_level = NONE
+archivedir = /etc/cran2deb/archive/debian-i386
+logfile = /dev/null
+
+[unstable]
+

diff --git a/trunk/inst/etc/sys/debian-i386/pbuilderrc b/trunk/inst/etc/sys/debian-i386/pbuilderrc
new file mode 100644 (file)
index 0000000..ca6b8e9
--- /dev/null
+++ b/trunk/inst/etc/sys/debian-i386/pbuilderrc
@@ -0,0 +1,13 @@
+BASETGZ=/var/cache/pbuilder/base-cran2deb-debian-i386.tgz
+HOOKDIR=/etc/cran2deb/hook
+BUILDRESULT=/var/cache/cran2deb/results/debian-i386
+EXTRAPACKAGES='debhelper r-base-dev cdbs r-base-core lintian xvfb xauth xfonts-base'
+REMOVEPACKAGES='lilo libldap-2.4-2 libopencdk10 libsasl2-2'
+# don't actually need aptitude, but pbuilder insists...
+#REMOVEPACKAGES+='aptitude libcwidget3 libept0 libncursesw5 libsigc++-2.0-0c2a libxapian15'
+DISTRIBUTION=unstable
+OTHERMIRROR='deb http://localhost/cran2deb/debian-i386 unstable/$(ARCH)/ | deb http://localhost/cran2deb/debian-i386 unstable/all/'
+MIRRORSITE='http://ftp.at.debian.org/debian/'
+APTCACHE=''
+PBUILDERSATISFYDEPENDSCMD='/usr/lib/pbuilder/pbuilder-satisfydepends-classic'
+DEBOOTSTRAPOPTS='--arch=i386'