new overrides from a most productive session with Dirk!

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

diff --git a/pkg/trunk/data/populate_depend_aliases b/pkg/trunk/data/populate_depend_aliases
index 61405627e9a356cb8f962f50cacff2d8f7d5e16d..d7dc09a95f02192c78d844f20a0683379ab15587 100644 (file)
--- a/pkg/trunk/data/populate_depend_aliases
+++ b/pkg/trunk/data/populate_depend_aliases
@@ -1,53 +1,75 @@
-alias_build boost libboost-dev
-alias_build boost libboost-graph-dev
-alias ggobi ggobi
-alias_build glade libglade2-dev
-alias_run glade libglade2-0
-alias_build glib libglib2.0-dev
-alias_run glib libglib2.0-0
-alias glu libglu1-mesa-dev
-alias_build gmp libgmp3-dev
-alias_run gmp libgmp3c2
-alias_build gsl libgsl0-dev
-alias_run gsl libgsl0ldbl
-alias_build ignore build-essential
-alias_build java openjdk-6-jdk
-alias_build java libgcj9-dev
-alias_run java openjdk-6-jre
-alias_build libatk libatk1.0-dev
-alias_run libatk libatk1.0-0
-alias libcairo libcairo2-dev
-alias_run libcurl libcurl3
-alias_build libcurl libcurl4-openssl-dev
-alias_build libdieharder libdieharder-dev
-alias_run libdieharder libdieharder2
-alias libfontconfig libfontconfig1-dev
-alias libfreetype libfreetype6-dev
-alias_build libgdal libgdal1-dev
-alias_run libgdal libgdal1-1.5.0
-alias libgd libgd2-noxpm-dev
-alias_build libgraphviz libgraphviz-dev
-alias_run libgraphviz libgraphviz4
-alias_build libgtk libgtk2.0-dev
-alias_run libgtk libgtk2.0-0
-alias libjpeg libjpeg62-dev
-alias libmagick libmagick9-dev
-alias_build libpango libpango1.0-dev
-alias_run libpango libpango1.0-0
-alias_build libpng libpng12-dev
-alias_run libpng libpng12-0
-alias libxml libxml2-dev
-alias msttcorefonts msttcorefonts
-alias_run netcdf libnetcdf4
-alias_build netcdf libnetcdf-dev
-alias_build opengl libgl1-mesa-dev
-alias_run opengl libgl1-mesa-glx
-alias pari-gp pari-gp
-alias proj proj
-alias_build quantlib libquantlib0-dev
-alias_run quantlib libquantlib-0.9.6
-alias_run sqlite libsqlite3-0
-alias_build sqlite libsqlite3-dev
-alias zlib zlib1g-dev
-alias cshell tcsh|csh|c-shell
-alias_build autotools autotools-dev
+alias_build boost libboost-dev 
+alias_build boost libboost-graph-dev 
+alias_build ggobi ggobi 
+alias_run ggobi ggobi 
+alias_build glade libglade2-dev 
+alias_run glade libglade2-0 
+alias_build glib libglib2.0-dev 
+alias_run glib libglib2.0-0 
+alias_build glu libglu1-mesa-dev 
+alias_run glu libglu1-mesa 
+alias_build gmp libgmp3-dev 
+alias_run gmp libgmp3c2 
+alias_build gsl libgsl0-dev 
+alias_run gsl libgsl0ldbl 
+alias_build ignore build-essential 
+alias_build java openjdk-6-jdk 
+alias_build java libgcj9-dev 
+alias_run java openjdk-6-jre 
+alias_build libatk libatk1.0-dev 
+alias_run libatk libatk1.0-0 
+alias_build libcairo libcairo2-dev 
+alias_run libcairo libcairo2 
+alias_run libcurl libcurl3 
+alias_build libcurl libcurl4-openssl-dev 
+alias_build libdieharder libdieharder-dev 
+alias_run libdieharder libdieharder2 
+alias_build libfontconfig libfontconfig1-dev 
+alias_run libfontconfig libfontconfig1 
+alias_build libfreetype libfreetype6-dev 
+alias_run libfreetype libfreetype6 
+alias_build libgdal libgdal1-dev 
+alias_run libgdal libgdal1-1.5.0 
+alias_build libgd libgd2-noxpm-dev 
+alias_run libgd libgd2-noxpm 
+alias_build libgraphviz libgraphviz-dev 
+alias_run libgraphviz libgraphviz4 
+alias_build libgtk libgtk2.0-dev 
+alias_run libgtk libgtk2.0-0 
+alias_build libjpeg libjpeg62-dev 
+alias_run libjpeg libjpeg62 
+alias_build libmagick libmagick9-dev 
+alias_run libmagick libmagick9 
+alias_build libpango libpango1.0-dev 
+alias_run libpango libpango1.0-0 
+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_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 
+alias_run pari-gp pari-gp 
+alias_build proj proj 
+alias_run proj proj 
+alias_build quantlib libquantlib0-dev 
+alias_run quantlib libquantlib-0.9.6 
+alias_run sqlite libsqlite3-0 
+alias_build sqlite libsqlite3-dev 
+alias_build zlib zlib1g-dev 
+alias_run zlib zlib1g 
+alias_build cshell tcsh|csh|c-shell 
+alias_run cshell tcsh|csh|c-shell 
+alias_build autotools autotools-dev 
+alias_build tcl tcl8.4-dev 
+alias_build tk tk8.4-dev 
+alias_build odbc unixodbc-dev 
+alias_build mysql libmysqlclient15-dev 
+alias_build mpi libopenmpi-dev 
+alias_build pvm pvm-dev 
+alias_build hdf5 libhdf5-serial-dev 
+alias_build sprng libsprng2-dev 

diff --git a/pkg/trunk/data/populate_forcedep b/pkg/trunk/data/populate_forcedep
index ef4a02eb0000c3155ee0d0c9d1e62f9d30632fec..799d286cbab03add694bb871645c56af8bb7d028 100644 (file)
--- a/pkg/trunk/data/populate_forcedep
+++ b/pkg/trunk/data/populate_forcedep
@@ -1,8 +1,18 @@
-force java rJava
-force autotools rJava
-force sqlite RSQLite
-force sqlite SQLiteDF
-force boost RBGL
-force netcdf ncdf
-force cshell dse
-force libgtk cairoDevice
+force java rJava 
+force autotools rJava 
+force sqlite RSQLite 
+force sqlite SQLiteDF 
+force boost RBGL 
+force netcdf ncdf 
+force cshell dse 
+force libgtk cairoDevice 
+force tcl tkrplot 
+force tk tkrplot 
+force mysql RMySQL 
+force mpi Rmpi 
+force pvm rpvm 
+force hdf5 hdf5 
+force libgtk rggobi 
+force libxml rggobi 
+force sprng rsprng 
+force gmp rsprng 

diff --git a/pkg/trunk/data/populate_licenses b/pkg/trunk/data/populate_licenses
index 89980b98d70f7f7f2575af8634982ff595e26bb4..57ac1712ce4e4c6afd36c67f0dedfe1e8fc0cfc2 100644 (file)
--- a/pkg/trunk/data/populate_licenses
+++ b/pkg/trunk/data/populate_licenses
@@ -87,3 +87,7 @@ accept distrib-noncomm
 accept GPL+ACM
 accept MCLUST
 accept UNCLEAR
+accept acepack
+accept ff
+pkg acepack acepack
+pkg ff ff

diff --git a/pkg/trunk/data/populate_sysreq b/pkg/trunk/data/populate_sysreq
index 02b33165cd4371b0471ab327d272af51ce568e5c..b8f4b3e20912eaa4dbea482b4c21bcf3432acc43 100644 (file)
--- a/pkg/trunk/data/populate_sysreq
+++ b/pkg/trunk/data/populate_sysreq
@@ -1,34 +1,37 @@
-sysreq ignore gcc
-sysreq ignore gnu make
-sysreq ignore % if present
-sysreq ignore none
-sysreq libcurl curl
-sysreq ggobi ggobi
-sysreq libatk atk
-sysreq libcairo cairo
-sysreq libdieharder dieharder%
-sysreq libfontconfig fontconfig
-sysreq libfreetype freetype
-sysreq libfreetype %freetype
-sysreq libgd libgd
-sysreq libgdal %gdal%
-sysreq opengl opengl
-sysreq glade %glade
-sysreq glib glib
-sysreq glu glu library
-sysreq gmp gmp
-sysreq libgraphviz graphviz
-sysreq gsl gnu gsl%
-sysreq gsl gnu scientific library
-sysreq libgtk gtk%
-sysreq libjpeg libjpeg%
-sysreq libmagick imagemagick
-sysreq libpango pango
-sysreq libpng libpng
-sysreq quantlib quantlib%
-sysreq libxml libxml%
-sysreq msttcorefonts msttcorefonts
-sysreq pari-gp pari/gp
-sysreq proj proj%
-sysreq zlib zlib
-sysreq java java
+sysreq ignore gcc 
+sysreq ignore gnu make 
+sysreq ignore % if present 
+sysreq ignore none 
+sysreq libcurl curl 
+sysreq ggobi ggobi 
+sysreq libatk atk 
+sysreq libcairo cairo 
+sysreq libdieharder dieharder% 
+sysreq libfontconfig fontconfig 
+sysreq libfreetype freetype 
+sysreq libfreetype %freetype 
+sysreq libgd libgd 
+sysreq libgdal %gdal% 
+sysreq opengl opengl 
+sysreq glade %glade 
+sysreq glib glib 
+sysreq glu glu library 
+sysreq gmp gmp 
+sysreq libgraphviz graphviz 
+sysreq gsl gnu gsl% 
+sysreq gsl gnu scientific library 
+sysreq libgtk gtk% 
+sysreq libjpeg libjpeg% 
+sysreq libmagick imagemagick 
+sysreq libpango pango 
+sysreq libpng libpng 
+sysreq quantlib quantlib% 
+sysreq libxml libxml% 
+sysreq msttcorefonts msttcorefonts 
+sysreq pari-gp pari/gp 
+sysreq proj proj% 
+sysreq zlib zlib 
+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