Improving compliance to Debian policy with the

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

diff --git a/trunk/R/debcontrol.R b/trunk/R/debcontrol.R
index 9018a2dd3b47313e67eaf3875e4f478f1d27dbf2..a4f9271f5df1f8c484655bc7b10f700ca0ce958f 100644 (file)
--- a/trunk/R/debcontrol.R
+++ b/trunk/R/debcontrol.R
@@ -122,24 +122,17 @@ 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.4'
+    control[1,'Standards-Version'] <- '3.9.1'
+    if ('URL' %in% colnames(pkg$description)) {
+        control[1,'Homepage'] <- pkg$description[1,'URL']
+    }
 
     control[2,'Package'] <- pkg$debname
     control[2,'Architecture'] <- 'all'
     if (pkg$archdep) {
         control[2,'Architecture'] <- 'any'
     }
-    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=', ')
-#    }
+    control[2,'Depends'] <- paste(pkg$depends$bin,collapse=', ',sep='')
 
     # generate the description
     descr <- 'GNU R package "'
@@ -148,11 +141,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.
@@ -165,7 +154,7 @@ generate_control <- function(pkg) {
     # write.dcf does not appear to have a nicer way of doing this.
     descr <- paste(descr,'"\n\n', long_descr, sep='')
     # add some extra nice info about the original R package
-    for (r_info in c('Author','Maintainer','URL')) {
+    for (r_info in c('Author','Maintainer')) {
         if (r_info %in% colnames(pkg$description)) {
             descr <- paste(descr,'\n\n',r_info,': ',pkg$description[1,r_info],sep='')
         }