rip bundles

[cran2deb.git] / trunk / R / debianpkg.R

diff --git a/trunk/R/debianpkg.R b/trunk/R/debianpkg.R
index 621c36e0fd928ffd1671489590f9ce6a02089cf7..e3656d31e8ae284133600aef506fe2db0a9ac618 100644 (file)
--- a/trunk/R/debianpkg.R
+++ b/trunk/R/debianpkg.R
@@ -109,18 +109,7 @@ prepare_new_debian <- function(pkg,extra_deps) {
     # says: ``The sources and headers for the compiled code are in src, plus
     # optionally file Makevars or Makefile.'' It seems unlikely that
     # architecture independent code would end up here.
-    if (pkg$is_bundle) {
-        # if it's a bundle, check each of the packages
-        pkg$archdep = F
-        for (pkgname in r_bundle_contains(pkg$name)) {
-            pkg$archdep = file.exists(file.path(pkg$path,pkgname,'src'))
-            if (pkg$archdep) {
-                break
-            }
-        }
-    } else {
-        pkg$archdep = file.exists(file.path(pkg$path,'src'))
-    }
+    pkg$archdep = file.exists(file.path(pkg$path,'src'))
     pkg$arch <- 'all'
     if (pkg$archdep) {
         pkg$arch <- host_arch()
@@ -129,10 +118,13 @@ prepare_new_debian <- function(pkg,extra_deps) {
     pkg$license <- accept_license(pkg)
     pkg$depends <- get_dependencies(pkg,extra_deps)
     apply_patches(pkg)
+    generate_lintian(pkg)
     generate_changelog(pkg)
     generate_rules(pkg)
     generate_copyright(pkg)
     generate_control(pkg)
+    ## debdir <- file.path(pkg$path,'debian')
+    ## system(paste("ls ", debdir, "; ls -l ", debdir, "/patches/*", sep=""))
 
     # convert text to utf8 (who knows what the original character set is --
     # let's hope iconv DTRT).