rip bundles

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

diff --git a/trunk/R/debcontrol.R b/trunk/R/debcontrol.R
index c439574e120a333c2d4de29f3321df2337e1b359..a044f89ca4b041c0a8ed2f375fab9d898ef8bd13 100644 (file)
--- a/trunk/R/debcontrol.R
+++ b/trunk/R/debcontrol.R
@@ -122,7 +122,7 @@ generate_control <- function(pkg) {
     control[1,'Priority'] <- 'optional'
     control[1,'Maintainer'] <- maintainer
     control[1,'Build-Depends'] <- paste(pkg$depends$build, collapse=', ')
-    control[1,'Standards-Version'] <- '3.8.3'
+    control[1,'Standards-Version'] <- '3.8.4'
 
     control[2,'Package'] <- pkg$debname
     control[2,'Architecture'] <- 'all'
@@ -131,16 +131,6 @@ generate_control <- function(pkg) {
     }
     control[2,'Depends'] <- paste(pkg$depends$bin,collapse=', ')
 
-#   # bundles provide virtual packages of their contents
-#   # unnecessary for now; cran2deb converts R bundles itself
-#    if (pkg$is_bundle) {
-#        control[2,'Provides'] = paste(
-#                    lapply(r_bundle_contains(pkg$name)
-#                          ,function(name) return(pkgname_as_debian(paste(name)
-#                                                                  ,repopref=pkg$repo)))
-#                          ,collapse=', ')
-#    }
-
     # generate the description
     descr <- 'GNU R package "'
     if ('Title' %in% colnames(pkg$description)) {
@@ -148,11 +138,7 @@ generate_control <- function(pkg) {
     } else {
         descr <- paste(descr,pkg$name,sep='')
     }
-    if (pkg$is_bundle) {
-        long_descr <- pkg$description[1,'BundleDescription']
-    } else {
-        long_descr <- pkg$description[1,'Description']
-    }
+    long_descr <- pkg$description[1,'Description']
 
     if (length(long_descr) < 1 || long_descr == "") {
         # bypass lintian extended-description-is-empty for which we care not.