latest overrides from vienna

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

diff --git a/branch/multisys/data/populate_depend_aliases b/branch/multisys/data/populate_depend_aliases
index d7dc09a95f02192c78d844f20a0683379ab15587..19c050b6b2c20a52cb7c759cc3184727afcabe27 100644 (file)
--- a/branch/multisys/data/populate_depend_aliases
+++ b/branch/multisys/data/populate_depend_aliases
@@ -46,10 +46,9 @@ alias_build libpng libpng12-dev
 alias_run libpng libpng12-0 
 alias_build libxml libxml2-dev 
 alias_run libxml libxml2 
-alias_build msttcorefonts msttcorefonts 
-alias_run msttcorefonts msttcorefonts 
+alias_build msttcorefonts ttf-liberation 
+alias_run msttcorefonts ttf-liberation 
 alias_run netcdf libnetcdf4 
-alias_build netcdf libnetcdf-dev 
 alias_build opengl libgl1-mesa-dev 
 alias_run opengl libgl1-mesa-glx 
 alias_build pari-gp pari-gp 
@@ -73,3 +72,17 @@ alias_build mpi libopenmpi-dev
 alias_build pvm pvm-dev 
 alias_build hdf5 libhdf5-serial-dev 
 alias_build sprng libsprng2-dev 
+alias_build netcdf libnetcdf-dev 
+alias_build libtiff libtiff4-dev 
+alias_build fftw libfftw3-dev 
+alias_build fftw-dev fftw-dev 
+alias_build r-recommended r-recommended 
+alias_run r-recommended r-recommended 
+alias_build libxt libxt-dev 
+alias_run libxt libxt6 
+alias_build grass grass-dev 
+alias_build blacs blacsgf-mpich-dev 
+alias_build scalapack scalapack-mpich-dev 
+alias_build mpich libmpich1.0-dev 
+alias_run libblas libblas3gf 
+alias_build libblas libblas-dev 

diff --git a/branch/multisys/data/populate_forcedep b/branch/multisys/data/populate_forcedep
index 799d286cbab03add694bb871645c56af8bb7d028..efcaac9ad7fe2153ee8d3a39ad57b32c938bd7c2 100644 (file)
--- a/branch/multisys/data/populate_forcedep
+++ b/branch/multisys/data/populate_forcedep
@@ -2,7 +2,6 @@ force java rJava
 force autotools rJava 
 force sqlite RSQLite 
 force sqlite SQLiteDF 
-force boost RBGL 
 force netcdf ncdf 
 force cshell dse 
 force libgtk cairoDevice 
@@ -16,3 +15,17 @@ force libgtk rggobi
 force libxml rggobi 
 force sprng rsprng 
 force gmp rsprng 
+force java JavaGD 
+force boost RBGL 
+force netcdf RNetCDF 
+force libtiff biOps 
+force fftw-dev rimage 
+force r-recommended spBayes 
+force libxt Cairo 
+force autotools qp 
+force boost MBA 
+force scalapack-mpich-dev scalapack 
+force libatlas-base-dev blas 
+force blacsgf-mpich-dev blacs 
+force mpich RScaLAPACK 
+force libblas odesolve 

diff --git a/branch/multisys/data/populate_sysreq b/branch/multisys/data/populate_sysreq
index b8f4b3e20912eaa4dbea482b4c21bcf3432acc43..51012cadf820f68533fefcb99b12f3c9ddd688cb 100644 (file)
--- a/branch/multisys/data/populate_sysreq
+++ b/branch/multisys/data/populate_sysreq
@@ -35,3 +35,20 @@ sysreq java java
 sysreq odbc %odbc% 
 sysreq ignore drivers. see readme. 
 sysreq ignore r must be compiled with --enable-r-shlib if the server is to be built 
+sysreq alias netcdf% 
+sysreq yacas yacas% 
+sysreq libtiff %libtiff% 
+sysreq ignore zlibdll 
+sysreq ignore jpegdll% 
+sysreq fftw fftw% 
+sysreq python python 
+sysreq ghostscript ghostscript 
+sysreq gsl libgsl 
+sysreq ignore rgl packages for rendering 
+sysreq grass grass 
+sysreq ignore internal files xba.cqv 
+sysreq ignore xba.regions 
+sysreq ignore lammpi or mpich 
+sysreq blas blas 
+sysreq blacs blacs 
+sysreq scalapack scalapack