X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2FR%2Fdebcontrol.R;h=a044f89ca4b041c0a8ed2f375fab9d898ef8bd13;hb=d8a2e28b2f013a8624cb587f09f90120f46f1ce8;hp=22afb2d5adebc8af076867b7835d6f4f2d89d8b6;hpb=3f540be9e6ae1c011301fd1e5973a0f6e614bd7d;p=cran2deb.git

diff --git a/trunk/R/debcontrol.R b/trunk/R/debcontrol.R
index 22afb2d..a044f89 100644
--- a/trunk/R/debcontrol.R
+++ b/trunk/R/debcontrol.R
@@ -115,43 +115,30 @@ map_aliases_to_debian <- function(aliases) {
 
 generate_control <- function(pkg) {
     # construct control file
-    control = data.frame()
-    control[1,'Source'] = pkg$srcname
-    control[1,'Section'] = 'gnu-r'
-    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[2,'Package'] = pkg$debname
-    control[2,'Architecture'] = 'all'
+
+    control <- data.frame()
+    control[1,'Source'] <- pkg$srcname
+    control[1,'Section'] <- 'gnu-r'
+    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[2,'Package'] <- pkg$debname
+    control[2,'Architecture'] <- 'all'
     if (pkg$archdep) {
-        control[2,'Architecture'] = 'any'
+        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=', ')
 
     # generate the description
-    descr = 'GNU R package "'
+    descr <- 'GNU R package "'
     if ('Title' %in% colnames(pkg$description)) {
-        descr = paste(descr,pkg$description[1,'Title'],sep='')
-    } else {
-        descr = paste(descr,pkg$name,sep='')
-    }
-    if (pkg$is_bundle) {
-        long_descr <- pkg$description[1,'BundleDescription']
+        descr <- paste(descr,pkg$description[1,'Title'],sep='')
     } else {
-        long_descr <- pkg$description[1,'Description']
+        descr <- paste(descr,pkg$name,sep='')
     }
+    long_descr <- pkg$description[1,'Description']
 
     if (length(long_descr) < 1 || long_descr == "") {
         # bypass lintian extended-description-is-empty for which we care not.
@@ -162,11 +149,17 @@ generate_control <- function(pkg) {
     # using \n\n.\n\n is not very nice, but is necessary to make sure
     # the longer description does not begin on the synopsis line --- R's
     # write.dcf does not appear to have a nicer way of doing this.
-    descr = paste(descr,'"\n\n', long_descr, sep='')
-    if ('URL' %in% colnames(pkg$description)) {
-        descr = paste(descr,'\n\nURL: ',pkg$description[1,'URL'],sep='')
+    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')) {
+        if (r_info %in% colnames(pkg$description)) {
+            descr <- paste(descr,'\n\n',r_info,': ',pkg$description[1,r_info],sep='')
+        }
     }
-    control[2,'Description'] = descr
+    if (Encoding(descr) == "unknown")
+        Encoding(descr) <- "latin1"     # or should it be UTF-8
+
+    control[2,'Description'] <- descr
 
     # Debian policy says 72 char width; indent minimally
     write.dcf(control,file=pkg$debfile('control.in'),indent=1,width=72)