depend: update dependencies to match what's in the Debian repository. force run...

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

diff --git a/pkg/trunk/R/debcontrol.R b/pkg/trunk/R/debcontrol.R
index 6ae2ed2a341d361ab6c9ab744d3a9dfb2eb70028..c610ce245810ea4abaaa4d25a02e7558a58fde0e 100644 (file)
--- a/pkg/trunk/R/debcontrol.R
+++ b/pkg/trunk/R/debcontrol.R
@@ -35,6 +35,9 @@ get_dependencies <- function(pkg,extra_deps) {
     # also include stuff to allow tcltk to build (suggested by Dirk)
     depends$build = c(depends$build,'xvfb','xauth','xfonts-base')
 
+    # make all bin dependencies build dependencies.
+    depends$build = c(depends$build, depends$bin)
+
     # remove duplicates
     depends <- lapply(depends,unique)
 

diff --git a/pkg/trunk/R/zzz.R b/pkg/trunk/R/zzz.R
index fe75b9a6b6a67e8a7c7e7c5bad9536315327c673..7d3584be9dd9fcc7b52c758bb8f37f0508b6cb05 100644 (file)
--- a/pkg/trunk/R/zzz.R
+++ b/pkg/trunk/R/zzz.R
@@ -10,7 +10,7 @@
     global("dinstall_archive", file.path(root,'var/archive'))
     global("r_depend_fields", c('Depends','Imports')) # Suggests, Enhances
     # git_revision {
-    global("git_revision","3278eadbf43c0c5a8a46f2298a38860c34f07ba4")
+    global("git_revision","b79d88001537df06dac28c27be3d4887ca2d9238")
     # git_revision }
     global("changesfile", function(srcname,version='*') {
         return(file.path(pbuilder_results

diff --git a/pkg/trunk/data/populate_depend_aliases b/pkg/trunk/data/populate_depend_aliases
index 175d74a0c2871b92b0430bc165583fd256a2292f..8b870c474a8b9846a8e8ce4264b29b395a2d4f02 100644 (file)
--- a/pkg/trunk/data/populate_depend_aliases
+++ b/pkg/trunk/data/populate_depend_aliases
@@ -1,38 +1,51 @@
 alias_build boost libboost-dev
 alias_build boost libboost-graph-dev
 alias ggobi ggobi
-alias glade libglade2-dev
-alias glib libglib2.0-dev
+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 gmp libgmp3-dev
-alias gsl libgsl0-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 libatk libatk1.0-dev
+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 libdieharder libdieharder-dev
+alias_build libdieharder libdieharder-dev
+alias_run libdieharder libdieharder2
 alias libfontconfig libfontconfig1-dev
 alias libfreetype libfreetype6-dev
-alias libgdal libgdal1-dev
+alias_build libgdal libgdal1-dev
+alias_run libgdal libgdal1-1.5.0
 alias libgd libgd2-noxpm-dev
-alias libgraphviz libgraphviz-dev
-alias libgtk libgtk2.0-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 libpango libpango1.0-dev
-alias libpng libpng12-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 opengl libgl1-mesa-dev
+alias_build opengl libgl1-mesa-dev
+alias_run opengl libgl1-mesa-glx
 alias pari-gp pari-gp
 alias proj proj
-alias quantlib libquantlib0-dev
+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